X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/afd5e75ffc8f64f0ebed1df9dce64793011c14a6..54a2a2a9983913a91ccef3aac107a159434a4714:/src/src/smtp_in.c

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 66f752dd4..9055020e1 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -457,7 +457,7 @@ if (smtp_batched_input)
 smtp_notquit_exit(US"command-timeout", US"421",
   US"%s: SMTP command timeout - closing connection",
   smtp_active_hostname);
-exim_exit(EXIT_FAILURE, US"receiving");
+exim_exit(EXIT_FAILURE);
 }
 
 void
@@ -468,7 +468,7 @@ if (smtp_batched_input)
   moan_smtp_batch(NULL, "421 SIGTERM received");  /* Does not return */
 smtp_notquit_exit(US"signal-exit", US"421",
   US"%s: Service not available - closing connection", smtp_active_hostname);
-exim_exit(EXIT_FAILURE, US"receiving");
+exim_exit(EXIT_FAILURE);
 }
 
 void
@@ -931,7 +931,7 @@ if (!yield)
   {
   log_write(0, LOG_MAIN|LOG_PANIC, "string too large in smtp_printf()");
   smtp_closedown(US"Unexpected error");
-  exim_exit(EXIT_FAILURE, NULL);
+  exim_exit(EXIT_FAILURE);
   }
 
 /* If this is the first output for a (non-batch) RCPT command, see if all RCPTs
@@ -5759,7 +5759,7 @@ while (done <= 0)
 
       oldsignal = signal(SIGCHLD, SIG_IGN);
 
-      if ((pid = fork()) == 0)
+      if ((pid = exim_fork(US"etrn-command")) == 0)
 	{
 	smtp_input = FALSE;       /* This process is not associated with the */
 	(void)fclose(smtp_in);    /* SMTP call any more. */
@@ -5770,7 +5770,8 @@ while (done <= 0)
 	/* If not serializing, do the exec right away. Otherwise, fork down
 	into another process. */
 
-	if (!smtp_etrn_serialize || (pid = fork()) == 0)
+	if (  !smtp_etrn_serialize 
+	   || (pid = exim_fork(US"etrn-serialised-command")) == 0)
 	  {
 	  DEBUG(D_exec) debug_print_argv(argv);
 	  exim_nullstd();                   /* Ensure std{in,out,err} exist */
@@ -5799,7 +5800,7 @@ while (done <= 0)
 	  }
 
 	enq_end(etrn_serialize_key);
-	exim_underbar_exit(EXIT_SUCCESS, US"etrn-serialize-interproc");
+	exim_underbar_exit(EXIT_SUCCESS);
 	}
 
       /* Back in the top level SMTP process. Check that we started a subprocess