Changeset 480 for trunk/server/source3/winbindd/winbindd_cm.c

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/winbindd_cm.c (modified) (4 diffs)

trunk/server/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);