Changeset 751 for trunk/server/source3/winbindd/winbindd_dual.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/winbindd/winbindd_dual.c (modified) (5 diffs)

trunk/server/source3/winbindd/winbindd_dual.c

@@ -44 +44 @@
 extern struct winbindd_methods cache_methods;
 
+static struct winbindd_child *winbindd_children = NULL;
+
 /* Read some data from a client connection */
 
@@ -172 +174 @@
                 close(state->child->sock);
                 state->child->sock = -1;
+                DLIST_REMOVE(winbindd_children, state->child);
                 tevent_req_error(req, err);
                 return;
@@ -489 +492 @@
         SMB_ASSERT(child->binding_handle != NULL);
 }
-
-static struct winbindd_child *winbindd_children = NULL;
 
 void winbind_child_died(pid_t pid)
@@ -1330 +1331 @@
                 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: "
@@ -1361 +1362 @@
         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: "