summaryrefslogtreecommitdiff
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2016-07-05 15:20:53 +0200
committerVolker Lendecke <vl@samba.org>2016-07-10 22:28:13 +0200
commit3a0c16b08c7dcfe389fbc429aae734ff52c84166 (patch)
tree802965e404dad064e5a0513766c3d87f1093b31d /source3/smbd/server.c
parent89e67e309a640df690d0fa0aa8c1b2f2537e47f4 (diff)
downloadsamba-3a0c16b08c7dcfe389fbc429aae734ff52c84166.tar.gz
smbd/cleanupd: use smbd_reinit_after_fork()
Using smbd_reinit_after_fork() rather then reinit_after_fork() ensures am_parent is reset to NULL. Otherwise, when exiting for some reason, the inherited atexit handler killkids() calls kill(0,SIGTERM) terminating our whole process group including the main smbd. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12016 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index cdcdcc25a2c..e68e0355b0f 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -478,7 +478,7 @@ static bool cleanupd_init(struct messaging_context *msg, bool interactive,
close(up_pipe[0]);
- status = reinit_after_fork(msg, ev, true, "cleanupd");
+ status = smbd_reinit_after_fork(msg, ev, true, "cleanupd");
if (!NT_STATUS_IS_OK(status)) {
DBG_WARNING("reinit_after_fork failed: %s\n",
nt_errstr(status));