The branch, v3-6-test has been updated
via feb446a s3: Avoid a select call per smb
from f6805ed s3-waf: try to deal with system w/o ldap; also move module
processing to the end of wscript.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit feb446ae83b72ef9e157dac97bfcee86e09c7afc
Author: Volker Lendecke <[email protected]>
Date: Fri Feb 11 11:25:13 2011 +0100
s3: Avoid a select call per smb
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Fri Feb 11 12:13:54 CET 2011 on sn-devel-104
(cherry picked from commit 16229e4cefb01c3bdf1cb1cef81f0eab1f1cc0e6)
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/process.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6c2908d..20569d8 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2263,7 +2263,7 @@ static void smbd_server_connection_read_handler(
if (from_client) {
smbd_lock_socket(conn);
- if (!fd_is_readable(fd)) {
+ if (lp_async_smb_echo_handler() && !fd_is_readable(fd)) {
DEBUG(10,("the echo listener was faster\n"));
smbd_unlock_socket(conn);
return;
--
Samba Shared Repository
