Changeset 478 for vendor/current/source3/winbindd

Timestamp:

Aug 2, 2010, 6:40:21 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: vendor update to 3.5.4

Location:

vendor/current/source3/winbindd

Files:

• winbindd.c (modified) (3 diffs)
• winbindd_cm.c (modified) (4 diffs)
• winbindd_dual.c (modified) (2 diffs)
• winbindd_util.c (modified) (2 diffs)

vendor/current/source3/winbindd/winbindd.c

@@ -373 +373 @@
         uint8 ret;
         pid_t child_pid;
-        struct sigaction act;
-        struct sigaction oldact;
 
         DEBUG(10, ("winbindd_msg_validate_cache: got validate-cache "
@@ -384 +382 @@
          * code can safely use fork/waitpid...
          */
-        CatchChild();
         child_pid = sys_fork();
 
@@ -402 +399 @@
         /* child */
 
+        if (!winbindd_reinit_after_fork(NULL)) {
+                _exit(0);
+        }
+
         /* install default SIGCHLD handler: validation code uses fork/waitpid */
-        ZERO_STRUCT(act);
-        act.sa_handler = SIG_DFL;
-#ifdef SA_RESTART
-        /* We *want* SIGALRM to interrupt a system call. */
-        act.sa_flags = SA_RESTART;
-#endif
-        sigemptyset(&act.sa_mask);
-        sigaddset(&act.sa_mask,SIGCHLD);
-        sigaction(SIGCHLD,&act,&oldact);
+        CatchSignal(SIGCHLD, SIG_DFL);
 
         ret = (uint8)winbindd_validate_cache_nobackup();

vendor/current/source3/winbindd/winbindd_cm.c

@@ -179 +179 @@
         pid_t parent_pid = sys_getpid();
         char *lfile = NULL;
-
-        /* Stop zombies */
-        CatchChild();
 
         if (domain->dc_probe_pid != (pid_t)-1) {
@@ -810 +807 @@
         peeraddr_len = sizeof(peeraddr);
 
-        if ((getpeername((*cli)->fd, &peeraddr, &peeraddr_len) != 0) ||
-            (peeraddr_len != sizeof(struct sockaddr_in)) ||
-            (peeraddr_in->sin_family != PF_INET))
-        {
-                DEBUG(0,("cm_prepare_connection: %s\n", strerror(errno)));
+        if ((getpeername((*cli)->fd, &peeraddr, &peeraddr_len) != 0)) {
+                DEBUG(0,("cm_prepare_connection: getpeername failed with: %s\n",
+                        strerror(errno)));
+                result = NT_STATUS_UNSUCCESSFUL;
+                goto done;
+        }
+
+        if ((peeraddr_len != sizeof(struct sockaddr_in))
+#ifdef HAVE_IPV6
+            && (peeraddr_len != sizeof(struct sockaddr_in6))
+#endif
+            ) {
+                DEBUG(0,("cm_prepare_connection: got unexpected peeraddr len %d\n",
+                        peeraddr_len));
+                result = NT_STATUS_UNSUCCESSFUL;
+                goto done;
+        }
+
+        if ((peeraddr_in->sin_family != PF_INET)
+#ifdef HAVE_IPV6
+            && (peeraddr_in->sin_family != PF_INET6)
+#endif
+            ) {
+                DEBUG(0,("cm_prepare_connection: got unexpected family %d\n",
+                        peeraddr_in->sin_family));
                 result = NT_STATUS_UNSUCCESSFUL;
                 goto done;
@@ -1134 +1151 @@
                                                                         domain->name,
                                                                         sitename,
-                                                                        pss);
+                                                                        pss,
+                                                                        name);
 
                                         SAFE_FREE(sitename);
@@ -1142 +1160 @@
                                                                         domain->name,
                                                                         NULL,
-                                                                        pss);
+                                                                        pss,
+                                                                        name);
                                 }
                                 winbindd_set_locator_kdc_envs(domain);

vendor/current/source3/winbindd/winbindd_dual.c

@@ -1215 +1215 @@
                                             logfilename))
                 return false;
+
+        /* Stop zombies in children */
+        CatchChild();
 
         /* Don't handle the same messages as our parent. */
@@ -1339 +1342 @@
         DEBUG(10, ("Child process %d\n", (int)sys_getpid()));
 
-        /* Stop zombies in children */
-        CatchChild();
-
         state.sock = fdpair[0];
         close(fdpair[1]);

vendor/current/source3/winbindd/winbindd_util.c

@@ -423 +423 @@
                                                 &cache_methods,
                                                 &dom_list[i].sid );
+                        if (d != NULL) {
+                                setup_domain_child(d, &d->child);
+                        }
                 }
 
@@ -492 +495 @@
                                                         &cache_methods,
                                                         &dom_list[i].sid );
+                                if (d != NULL) {
+                                        setup_domain_child(d, &d->child);
+                                }
                         }