The branch, v3-6-test has been updated
via 67acc4c s3: Handle EINTR from sys_poll correctly
from 9bffdda s3: Tune broadcast namequeries for unique names
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 67acc4c263f0b3dd4951615e684bfe572f644812
Author: Volker Lendecke <[email protected]>
Date: Tue May 3 17:04:06 2011 +0200
s3: Handle EINTR from sys_poll correctly
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Tue May 3 18:06:48 CEST 2011 on sn-devel-104
(cherry picked from commit 023260487517e835edd7f16c8485f9e84cf44667)
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/process.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 1063269..98de361 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1004,7 +1004,10 @@ static NTSTATUS smbd_server_connection_loop_once(struct
smbd_server_connection *
errno = sav;
}
- if (ret == -1 && errno != EINTR) {
+ if (ret == -1) {
+ if (errno == EINTR) {
+ return NT_STATUS_RETRY;
+ }
return map_nt_error_from_unix(errno);
}
--
Samba Shared Repository
