Changeset 309 for branches/samba-3.3.x/source/smbd/server.c

Timestamp:

Aug 4, 2009, 8:51:22 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.7

File:

• branches/samba-3.3.x/source/smbd/server.c (modified) (3 diffs)

branches/samba-3.3.x/source/smbd/server.c

@@ -356 +356 @@
         unsigned dns_port = 0;
 
-        if (!is_daemon) {
-                return open_sockets_inetd();
-        }
-
 #ifdef HAVE_ATEXIT
         {
@@ -369 +365 @@
         }
 #endif
+
+        if (!is_daemon) {
+                /*
+                 * Stop zombies the old way.
+                 * We aren't forking any new
+                 * 'normal' connections when
+                 * run from [x]inetd.
+                 */
+                CatchChild();
+                return open_sockets_inetd();
+        }
 
         /* Stop zombies */
@@ -1260 +1267 @@
         BlockSignals(False, SIGTERM);
 
+        /* Ensure we leave no zombies until we
+         * correctly set up child handling below. */
+        CatchChild();
+
         /* we want total control over the permissions on created files,
            so set our umask to 0 */