From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Fri, 23 May 2025 03:55:57 +0000 (+1200)
Subject: s4:prefork: mention service name in exit messages
X-Git-Tag: tevent-0.17.0~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9cd75c48dc2826013d0eed5c82d9f7f92d14a79e;p=thirdparty%2Fsamba.git

s4:prefork: mention service name in exit messages

REF: https://lists.samba.org/archive/samba/2025-February/250946.html

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Rowland Penny <rpenny@samba.org>
---

diff --git a/source4/samba/process_prefork.c b/source4/samba/process_prefork.c
index 92e145d4c67..24d2de65842 100644
--- a/source4/samba/process_prefork.c
+++ b/source4/samba/process_prefork.c
@@ -621,21 +621,21 @@ static void prefork_child_pipe_handler(struct tevent_context *ev,
 	irpc_cleanup(rc->lp_ctx, ev, pid);
 	status = tfork_status(&rc->t, false);
 	if (status == -1) {
-		DBG_ERR("Parent %d, Child %d terminated, "
+		DBG_ERR("%s: Parent %d, Child %d terminated, "
 			"unable to get status code from tfork\n",
-			getpid(), pid);
+			rc->service_name, getpid(), pid);
 		rc_inuse = prefork_restart(ev, rc);
 	} else if (WIFEXITED(status)) {
 		status = WEXITSTATUS(status);
-		DBG_ERR("Parent %d, Child %d exited with status %d\n",
-			 getpid(), pid,  status);
+		DBG_ERR("%s: Parent %d, Child %d exited with status %d\n",
+			rc->service_name, getpid(), pid,  status);
 		if (status != 0) {
 			rc_inuse = prefork_restart(ev, rc);
 		}
 	} else if (WIFSIGNALED(status)) {
 		status = WTERMSIG(status);
-		DBG_ERR("Parent %d, Child %d terminated with signal %d\n",
-			getpid(), pid, status);
+		DBG_ERR("%s: Parent %d, Child %d terminated with signal %d\n",
+			rc->service_name, getpid(), pid, status);
 		if (status == SIGABRT || status == SIGBUS || status == SIGFPE ||
 		    status == SIGILL || status == SIGSYS || status == SIGSEGV ||
 		    status == SIGKILL) {