Changeset 732 for branches/samba-3.5.x/source3/winbindd/winbindd_dual.c

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

File:

• branches/samba-3.5.x/source3/winbindd/winbindd_dual.c (modified) (4 diffs)

branches/samba-3.5.x/source3/winbindd/winbindd_dual.c

@@ -135 +135 @@
         struct tevent_req *subreq;
 
-        if ((state->child->pid == 0) && (!fork_domain_child(state->child))) {
+        if ((state->child->sock == -1) && (!fork_domain_child(state->child))) {
                 tevent_req_error(req, errno);
                 return;
@@ -165 +165 @@
         TALLOC_FREE(subreq);
         if (ret == -1) {
+                /*
+                 * The basic parent/child communication broke, close
+                 * our socket
+                 */
+                close(state->child->sock);
+                state->child->sock = -1;
                 tevent_req_error(req, err);
                 return;
@@ -503 +509 @@
         }
 
+        child->sock = -1;
         child->domain = domain;
         child->table = table;
@@ -531 +538 @@
 
         DLIST_REMOVE(children, child);
-
-        close(child->sock);
-        child->sock = -1;
         child->pid = 0;
 }