[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1736-gd7480a9

Bo Yang boyang at samba.org
Thu May 21 03:32:32 GMT 2009


The branch, master has been updated
       via  d7480a91b4331a5c98517338f2c258bf270926a3 (commit)
      from  cbe3dabb9d1fe4e16e14c50550df2afab7e4a21e (commit)

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


- Log -----------------------------------------------------------------
commit d7480a91b4331a5c98517338f2c258bf270926a3
Author: Bo Yang <boyang at samba.org>
Date:   Fri May 22 03:22:52 2009 +0800

    s3: ignore EPIPE error when winbind finally writes to wb client because client might have already closed the socket
    
    Signed-off-by: Bo Yang <boyang at samba.org>

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

Summary of changes:
 source3/winbindd/winbindd.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index fb7eda9..52517b0 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -866,8 +866,14 @@ static void remove_client(struct winbindd_cli_state *state)
 	/* tell client, we are closing ... */
 	nwritten = write(state->sock, &c, sizeof(c));
 	if (nwritten == -1) {
-		DEBUG(2, ("final write to client failed: %s\n",
-			  strerror(errno)));
+		/* 
+		 * ignore EPIPE error here, because the other end might
+		 * have already closed the socket.
+		 */
+		if (errno != EPIPE) {
+			DEBUG(2, ("final write to client failed: %s\n",
+			  	strerror(errno)));
+		}
 	}
 
 	/* Close socket */


-- 
Samba Shared Repository


More information about the samba-cvs mailing list