From: Alexander Bokovoy <ab@samba.org>
Date: Wed, 26 Mar 2014 10:30:30 +0000 (+0200)
Subject: ad-dc: use exit_daemon() to communicate status of startup to systemd
X-Git-Tag: ldb-1.1.17~89
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=720f7639e43514d37c14da067389c421811279fa;p=bbaumbach%2Fsamba-autobuild%2F.git

ad-dc: use exit_daemon() to communicate status of startup to systemd

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

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Apr 23 04:44:46 CEST 2014 on sn-devel-104
---

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 9051b485317..55fd38ca8fe 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -398,15 +398,13 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
 	if (lpcfg_server_role(cmdline_lp_ctx) == ROLE_ACTIVE_DIRECTORY_DC) {
 		if (!open_schannel_session_store(talloc_autofree_context(), cmdline_lp_ctx)) {
-			DEBUG(0,("ERROR: Samba cannot open schannel store for secured NETLOGON operations.\n"));
-			exit(1);
+			exit_daemon("Samba cannot open schannel store for secured NETLOGON operations.", EACCES);
 		}
 	}
 
 	/* make sure we won't go through nss_winbind */
 	if (!winbind_off()) {
-		DEBUG(0,("Failed to disable recusive winbindd calls.  Exiting.\n"));
-		exit(1);
+		exit_daemon("Samba failed to disable recusive winbindd calls.", EACCES);
 	}
 
 	gensec_init(); /* FIXME: */
@@ -431,8 +429,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 	event_ctx = s4_event_context_init(talloc_autofree_context());
 
 	if (event_ctx == NULL) {
-		DEBUG(0,("Initializing event context failed\n"));
-		return 1;
+		exit_daemon("Initializing event context failed", EACCES);
 	}
 
 	if (opt_interactive) {
@@ -449,7 +446,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 #endif
 
 	if (fstat(0, &st) != 0) {
-		exit(1);
+		exit_daemon("Samba failed to set standard input handler", ENOTTY);
 	}
 
 	if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode)) {
@@ -478,15 +475,14 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 		DEBUG(0, ("At this time the 'samba' binary should only be used for either:\n"));
 		DEBUGADD(0, ("'server role = active directory domain controller' or to access the ntvfs file server with 'server services = +smb' or the rpc proxy with 'dcerpc endpoint servers = remote'\n"));
 		DEBUGADD(0, ("You should start smbd/nmbd/winbindd instead for domain member and standalone file server tasks\n"));
-		exit(1);
+		exit_daemon("Samba detected misconfigured 'server role' and exited. Check logs for details", EINVAL);
 	};
 
 	prime_ldb_databases(event_ctx);
 
 	status = setup_parent_messaging(event_ctx, cmdline_lp_ctx);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("Failed to setup parent messaging - %s\n", nt_errstr(status)));
-		return 1;
+		exit_daemon("Samba failed to setup parent messaging", NT_STATUS_V(status));
 	}
 
 	DEBUG(0,("%s: using '%s' process model\n", binary_name, model));
@@ -494,8 +490,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 	status = server_service_startup(event_ctx, cmdline_lp_ctx, model, 
 					lpcfg_server_services(cmdline_lp_ctx));
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("Starting Services failed - %s\n", nt_errstr(status)));
-		return 1;
+		exit_daemon("Samba failed to start services", NT_STATUS_V(status));
 	}
 
 	if (opt_daemon) {