]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: nmbd: Ensure the main nmbd process doesn't create zombies.
authorJeremy Allison <jra@samba.org>
Tue, 23 Sep 2014 20:32:37 +0000 (13:32 -0700)
committerKarolin Seeger <kseeger@samba.org>
Mon, 13 Oct 2014 21:31:07 +0000 (23:31 +0200)
Use the same mechanism as setup for smbd and winbindd.

Fixes bug #10830 - nmbd can leave unreaped zombies.

https://bugzilla.samba.org/show_bug.cgi?id=10830

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(v4-0-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-0-test): Mon Oct 13 23:31:07 CEST 2014 on sn-devel-104

source3/nmbd/nmbd.c

index 4d3e0396a5fc9165d340b7791f2582aec4ac1733..c924dd45ba2b7b0da9343336e8bc5c8252500c2c 100644 (file)
@@ -876,6 +876,9 @@ static bool open_sockets(bool isdaemon, int port)
        BlockSignals(True, SIGUSR2);
 #endif
 
+       /* Ignore children - no zombies. */
+       CatchChild();
+
        if ( opt_interactive ) {
                Fork = False;
                log_stdout = True;