From efd0c35a7e195865b18ce75bf2d592aaf1724d7d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 9 Jun 2010 17:08:41 -0700 Subject: Ensure we don't send SMB1 keepalives on an SMB2 connection. Jeremy. --- source3/smbd/process.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 3396f89bc1..f032e6ab78 100644 --- 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); -- cgit