X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/53c7b3a70978c2748f46d1d99211530750b1de22..32393657bff79d9925ec865aebb066c9409c4e27:/src/src/smtp_in.c

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 580fe9f91..b5f44f548 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -877,6 +877,8 @@ flush for non-TLS connections. The smtp_fflush() function is available for
 checking that: for convenience, TLS output errors are remembered here so that
 they are also picked up later by smtp_fflush().
 
+This function is exposed to the local_scan API; do not change the signature.
+
 Arguments:
   format      format string
   more	      further data expected
@@ -897,7 +899,10 @@ va_end(ap);
 
 /* This is split off so that verify.c:respond_printf() can, in effect, call
 smtp_printf(), bearing in mind that in C a vararg function can't directly
-call another vararg function, only a function which accepts a va_list. */
+call another vararg function, only a function which accepts a va_list.
+
+This function is exposed to the local_scan API; do not change the signature.
+*/
 /*XXX consider passing caller-info in, for string_vformat-onward */
 
 void
@@ -2087,6 +2092,7 @@ dmarc_used_domain = NULL;
 #endif
 #ifdef EXPERIMENTAL_ARC
 arc_state = arc_state_reason = NULL;
+arc_received_instance = 0;
 #endif
 dsn_ret = 0;
 dsn_envid = NULL;
@@ -4402,8 +4408,8 @@ while (done <= 0)
 	    if (au->server)
 	      {
 	      DEBUG(D_auth+D_expand) debug_printf_indent(
-		"Evaluating advertise_condition for %s athenticator\n",
-		au->public_name);
+		"Evaluating advertise_condition for %s %s athenticator\n",
+		au->name, au->public_name);
 	      if (  !au->advertise_condition
 		 || expand_check_condition(au->advertise_condition, au->name,
 			US"authenticator")
@@ -5753,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. */
@@ -5764,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 */
@@ -5793,7 +5800,7 @@ while (done <= 0)
 	  }
 
 	enq_end(etrn_serialize_key);
-	exim_underbar_exit(EXIT_SUCCESS);
+	exim_underbar_exit(EXIT_SUCCESS, US"etrn-serialize-interproc");
 	}
 
       /* Back in the top level SMTP process. Check that we started a subprocess