[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  6f30b9a... s3:smbd: handle SMB2 in deadtime_fn() and avoid disconnecting non idle clients
      from  74f36df... selftest: Update sys.path before attempting to import external modules.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6f30b9a6ff57ca6112e6319c64c411d2bf09be79
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Mar 31 04:54:41 2010 +0200

    s3:smbd: handle SMB2 in deadtime_fn() and avoid disconnecting non idle clients
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/process.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository