Add deadtime detection for SMB2. Correctly update lastused timestamp across all activ...

[anatoliy/anatoliy.git] / source3 / smbd / process.c

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index ff2b8fc67d503b8e6fbd2f4ff87690daf0b28ddc..f2aa23e3e09b334cb6f73578a053625b904f366a 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2467,21 +2467,9 @@ static bool deadtime_fn(const struct timeval *now, void *private_data)
        struct smbd_server_connection *sconn =
                (struct smbd_server_connection *)private_data;
 
-       if (sconn->using_smb2) {
-               /* TODO: implement real idle check */
-               if (sconn->smb2.sessions.list) {
-                       return true;
-               }
-               DEBUG( 2, ( "Closing idle SMB2 connection\n" ) );
-               messaging_send(sconn->msg_ctx,
-                              messaging_server_id(sconn->msg_ctx),
-                              MSG_SHUTDOWN, &data_blob_null);
-               return false;
-       }
-
        if ((conn_num_open(sconn) == 0)
            || (conn_idle_all(sconn, now->tv_sec))) {
-               DEBUG( 2, ( "Closing idle SMB1 connection\n" ) );
+               DEBUG( 2, ( "Closing idle connection\n" ) );
                messaging_send(sconn->msg_ctx,
                               messaging_server_id(sconn->msg_ctx),
                               MSG_SHUTDOWN, &data_blob_null);