[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Tue May 3 10:07:02 MDT 2011


The branch, master has been updated
       via  0232604 s3: Handle EINTR from sys_poll correctly
      from  9c48345 s3-proto: move remaining krb5 protos to krb5_protos.h

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


- Log -----------------------------------------------------------------
commit 023260487517e835edd7f16c8485f9e84cf44667
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 3 17:04:06 2011 +0200

    s3: Handle EINTR from sys_poll correctly
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue May  3 18:06:48 CEST 2011 on sn-devel-104

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

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 c17ff7b..169c459 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1005,7 +1005,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


More information about the samba-cvs mailing list