X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Ftransports%2Fsmtp.c;h=fc5bb7801f8637df0b6060b3ec4335903ff779f9;hb=8102279385f5f70c959aa219feca37031c0a1828;hp=7be9e8e6645ca7e5e877d61fc867b4aa03fdaccd;hpb=96c8151125ceb98ed52c0089f6401e6ba05bb41e;p=exim.git

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 7be9e8e66..fc5bb7801 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -3284,13 +3284,9 @@ int max_fd = MAX(pfd[0], tls_out.active.sock) + 1;
 int rc, i;
 
 close(pfd[1]);
-if ((rc = exim_fork(US"tls proxy")))
-  {
-  DEBUG(D_transport) debug_printf("proxy-proc final-pid %d\n", rc);
+if ((rc = exim_fork(US"tls-proxy")))
   _exit(rc < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
-  }
 
-testharness_pause_ms(100); /* let parent debug out */
 set_process_info("proxying TLS connection for continued transport");
 FD_ZERO(&rfds);
 FD_SET(tls_out.active.sock, &rfds);
@@ -3365,7 +3361,7 @@ for (int fd_bits = 3; fd_bits; )
 
 done:
   testharness_pause_ms(100);	/* let logging complete */
-  exim_exit(0, US"TLS proxy");
+  exim_exit(EXIT_SUCCESS);
 }
 #endif
 
@@ -4279,10 +4275,9 @@ propagate it from the initial
 #ifndef DISABLE_TLS
 	if (tls_out.active.sock >= 0)
 	  {
-	  int pid = exim_fork(US"tls proxy interproc");
+	  int pid = exim_fork(US"tls-proxy-interproc");
 	  if (pid == 0)		/* child; fork again to disconnect totally */
 	    {
-	    testharness_pause_ms(100); /* let parent debug out */
 	    /* does not return */
 	    smtp_proxy_tls(sx->cctx.tls_ctx, sx->buffer, sizeof(sx->buffer), pfd,
 			    ob->command_timeout);
@@ -4290,7 +4285,6 @@ propagate it from the initial
 
 	  if (pid > 0)		/* parent */
 	    {
-	    DEBUG(D_transport) debug_printf("proxy-proc inter-pid %d\n", pid);
 	    close(pfd[0]);
 	    /* tidy the inter-proc to disconn the proxy proc */
 	    waitpid(pid, NULL, 0);