diff options
| -rw-r--r-- | source/smbd/server.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/source/smbd/server.c b/source/smbd/server.c index e9141181a50..35c98aa11df 100644 --- a/source/smbd/server.c +++ b/source/smbd/server.c @@ -348,10 +348,6 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_ struct dns_reg_state * dns_reg = NULL; unsigned dns_port = 0; - if (!is_daemon) { - return open_sockets_inetd(); - } - #ifdef HAVE_ATEXIT { static int atexit_set; @@ -362,6 +358,17 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_ } #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 */ CatchSignal(SIGCLD, sig_cld); @@ -1199,6 +1206,10 @@ 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); |