[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Fri Aug 26 05:15:03 MDT 2011


The branch, master has been updated
       via  e0e3d21 s3: Use sys_write in fork_domain_child
       via  964e809 s3: Use sys_read in fork_domain_child
      from  099b9db py-samba3-test: Copy sample database in tempdir before running test

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


- Log -----------------------------------------------------------------
commit e0e3d215b1902ecbeb3d469af9a196856711921e
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 26 11:39:41 2011 +0200

    s3: Use sys_write in fork_domain_child
    
    Counterpart for last checkin. A lot less likely, but not impossible in a child.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Aug 26 13:14:27 CEST 2011 on sn-devel-104

commit 964e809ce2069ad888e0fb12dfe51bac5a461508
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 26 11:38:21 2011 +0200

    s3: Use sys_read in fork_domain_child
    
    I've seen
    
    [2011/08/26 01:44:10.872057,  1] winbindd/winbindd_dual.c:1336(fork_domain_child)
      fork_domain_child: Could not read child status: nread=-1, error=Interrupted system call
    
    on a customer box. Not good.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 5bf90b1..8851b8a 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1329,7 +1329,7 @@ static bool fork_domain_child(struct winbindd_child *child)
 
 		close(fdpair[0]);
 
-		nread = read(fdpair[1], &status, sizeof(status));
+		nread = sys_read(fdpair[1], &status, sizeof(status));
 		if (nread != sizeof(status)) {
 			DEBUG(1, ("fork_domain_child: Could not read child status: "
 				  "nread=%d, error=%s\n", (int)nread,
@@ -1360,7 +1360,7 @@ static bool fork_domain_child(struct winbindd_child *child)
 
 	status = winbindd_reinit_after_fork(child, child->logfilename);
 
-	nwritten = write(state.sock, &status, sizeof(status));
+	nwritten = sys_write(state.sock, &status, sizeof(status));
 	if (nwritten != sizeof(status)) {
 		DEBUG(1, ("fork_domain_child: Could not write status: "
 			  "nwritten=%d, error=%s\n", (int)nwritten,


-- 
Samba Shared Repository


More information about the samba-cvs mailing list