Ensure we don't send SMB1 keepalives on an SMB2 connection.

Jeremy.

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 3396f89bc17beed66cc8663888e9ddf1881f4933..f032e6ab785c2bca739abc6d77d853e71a31b739 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2394,8 +2394,14 @@ static int client_get_tcp_info(struct sockaddr_storage *server,
  */
 static bool keepalive_fn(const struct timeval *now, void *private_data)
 {
+       struct smbd_server_connection *sconn = smbd_server_conn;
        bool ret;
 
+       if (sconn->allow_smb2) {
+               /* Don't do keepalives on an SMB2 connection. */
+               return false;
+       }
+
        smbd_lock_socket(smbd_server_conn);
        ret = send_keepalive(smbd_server_fd());
        smbd_unlock_socket(smbd_server_conn);