From 08161e093d38f0d7b54841f5572a024f228408fa Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 30 Mar 2010 12:46:26 +0200 Subject: selftest: Convert filter-subunit to Python so the subunit Python module can be used later. --- source3/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index 97b3275e46..8cc6c66b23 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3251,7 +3251,7 @@ selftest:: all torture timelimit --testlist="$(srcdir)/selftest/tests.sh|" \ --exclude=$(srcdir)/selftest/skip \ --socket-wrapper $(TESTS) | \ - $(PERL) $(selftestdir)/filter-subunit.pl \ + $(PYTHON) $(selftestdir)/filter-subunit \ --expected-failures=$(srcdir)/selftest/knownfail | \ $(PYTHON) $(selftestdir)/format-subunit --immediate -- cgit From 6f30b9a6ff57ca6112e6319c64c411d2bf09be79 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 31 Mar 2010 04:54:41 +0200 Subject: s3:smbd: handle SMB2 in deadtime_fn() and avoid disconnecting non idle clients metze --- source3/smbd/process.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 6068816ad9..dd120f9bd2 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; -- cgit