Changeset 335 for branches/samba-3.2.x/source/smbd/server.c

Timestamp:

Sep 24, 2009, 9:15:13 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.14 (final)

File:

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

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

@@ -349 +349 @@
         unsigned dns_port = 0;
 
-        if (!is_daemon) {
-                return open_sockets_inetd();
-        }
-
 #ifdef HAVE_ATEXIT
         {
@@ -362 +358 @@
         }
 #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 */
@@ -1207 +1214 @@
         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 */