[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1148-gec18e0f

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  ec18e0f11eda8d25feb14c92cf7d90bda8d79269 (commit)
      from  a291e88019771bb2703bf9854483404a6ee8d622 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit ec18e0f11eda8d25feb14c92cf7d90bda8d79269
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 17 13:56:21 2009 -0700

    Fix bug #6476 - more then 3000 smbd-zombies in memory
    We weren't reaping children in the [x]inetd case.
    Jeremy.
    (cherry picked from commit 7d20e8f7f4d3d1a17b3817cea370304f2f437809)

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/server.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 685b26f..30addaf 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1045,6 +1045,11 @@ extern void build_options(bool screen);
 	BlockSignals(False, SIGUSR1);
 	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 */
 	umask(0);
@@ -1211,6 +1216,13 @@ extern void build_options(bool screen);
 		/* close our standard file descriptors */
 		close_low_fds(False); /* Don't close stderr */
 
+#ifdef HAVE_ATEXIT
+		atexit(killkids);
+#endif
+
+	        /* Stop zombies */
+		smbd_setup_sig_chld_handler();
+
 		smbd_process();
 
 		exit_server_cleanly(NULL);


-- 
Samba Shared Repository