From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 4 Sep 2012 09:06:15 +0000 (+0200)
Subject: file_server: Run task_server_terminate when smbd exists
X-Git-Tag: samba-4.0.0rc1~257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73932a3aa40bb4b2c2bd22f1be3abc546ab83481;p=thirdparty%2Fsamba.git

file_server: Run task_server_terminate when smbd exists

This will help us shut down when smbd cannot bind to ports or perform
some other critical startup operation.

Based on a patch by Stefan Metzmacher <metze@samba.org>

Andrew Bartlett
---

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 7c8517e46f9..091432f02b0 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -78,6 +78,9 @@ static const char *generate_smb_conf(struct task_server *task)
  */
 static void file_server_smbd_done(struct tevent_req *subreq)
 {
+	struct task_server *task =
+		tevent_req_callback_data(subreq,
+		struct task_server);
 	int sys_errno;
 	int ret;
 
@@ -87,6 +90,7 @@ static void file_server_smbd_done(struct tevent_req *subreq)
 	} else {
 		DEBUG(0,("file_server smbd daemon exited normally\n"));
 	}
+	task_server_terminate(task, "smbd child process exited", true);
 }