[SCM] Samba Shared Repository - branch v3-6-test updated

Volker Lendecke vlendec at samba.org
Thu Feb 17 03:18:01 MST 2011


The branch, v3-6-test has been updated
       via  799152f s3: increase the log level for missing PIDs on SIGCHLD
      from  b9b65a2 s3-selftest: make sure we really use --format=subunit when calling smbtorture4.

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


- Log -----------------------------------------------------------------
commit 799152fecc08de0f789a1b285f453dcb886acef5
Author: David Disseldorp <ddiss at suse.de>
Date:   Wed Feb 16 17:23:25 2011 +0100

    s3: increase the log level for missing PIDs on SIGCHLD
    
    Since the fix for bso#7836, the parent smbd is responsible for
    maintaining an up-to-date printcap cache. It does this by forking a
    child process to asynchronously fetch printcap data from CUPS.
    
    When the child process exits after fetching all printcap data, the
    parent smbd is sent SIGCHLD. This triggers smbd_sig_chld_handler() which
    looks for the exited process PID on a "children" list.
    Child smbd process PIDs are added to the "children" list to ensure
    cleanup on unclean shutdown and log level change notification messages.
    
    Printcap update process PIDs are not added to the list as they do not
    maintain any state that requires cleanup, nor do they wait on tevent for
    messages.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Thu Feb 17 11:11:45 CET 2011 on sn-devel-104
    (cherry picked from commit 9c12232f1ae36e00d04114ad73edd8ba3c2c6a5c)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 10e8b62..f4436bf 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -294,7 +294,8 @@ static void remove_child_pid(pid_t pid, bool unclean_shutdown)
 		}
 	}
 
-	DEBUG(0, ("Could not find child %d -- ignoring\n", (int)pid));
+	/* not all forked child processes are added to the children list */
+	DEBUG(1, ("Could not find child %d -- ignoring\n", (int)pid));
 }
 
 /****************************************************************************


-- 
Samba Shared Repository


More information about the samba-cvs mailing list