From: Ralph Boehme <slow@samba.org>
Date: Sun, 20 May 2018 16:47:37 +0000 (+0200)
Subject: smbd: setup cleanupd *after* the scavenger
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d9b65f85f029fb89cb8494e55304e667662105d;p=thirdparty%2Fsamba.git

smbd: setup cleanupd *after* the scavenger

This ensure the private scavenger state is initialized in the cleanupd
child which is used in scavegenger_schedule_disconnected().

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
---

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1509ae02256..a54a80ac5d9 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -2430,13 +2430,6 @@ quic_disabled:
 		exit_daemon("Samba cannot init notification", EACCES);
 	}
 
-	if (!cleanupd_init(
-		    msg_ctx,
-		    cmdline_daemon_cfg->interactive,
-		    &parent->cleanupd)) {
-		exit_daemon("Samba cannot init the cleanupd", EACCES);
-	}
-
 	if (!messaging_parent_dgm_cleanup_init(msg_ctx)) {
 		exit(1);
 	}
@@ -2445,6 +2438,13 @@ quic_disabled:
 		exit_daemon("Samba cannot init scavenging", EACCES);
 	}
 
+	if (!cleanupd_init(
+		    msg_ctx,
+		    cmdline_daemon_cfg->interactive,
+		    &parent->cleanupd)) {
+		exit_daemon("Samba cannot init the cleanupd", EACCES);
+	}
+
 	if (!W_ERROR_IS_OK(registry_init_full()))
 		exit_daemon("Samba cannot init registry", EACCES);