X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/86ddd98d63910f57b5aaacc6d77e09aa65b10b32..b07d141af23f2ab160eba2b58a834baee513b3f8:/src/src/verify.c

diff --git a/src/src/verify.c b/src/src/verify.c
index 6e07566a7..a5c6de576 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -3,7 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with verifying things. The original code for callout
@@ -815,7 +815,7 @@ tls_retry_connection:
 	    sx->cctx.sock = -1;
 #ifndef DISABLE_EVENT
 	    (void) event_raise(addr->transport->event_action,
-			      US"tcp:close", NULL);
+			      US"tcp:close", NULL, NULL);
 #endif
 	    addr->address = main_address;
 	    addr->transport_return = PENDING_DEFER;
@@ -1127,7 +1127,7 @@ no_conn:
 	(void)close(sx->cctx.sock);
 	sx->cctx.sock = -1;
 #ifndef DISABLE_EVENT
-	(void) event_raise(addr->transport->event_action, US"tcp:close", NULL);
+	(void) event_raise(addr->transport->event_action, US"tcp:close", NULL, NULL);
 #endif
 	}
       }
@@ -2150,10 +2150,6 @@ for (addr_list = addr_local, i = 0; i < 2; addr_list = addr_remote, i++)
     addr_list = addr->next;
 
     fprintf(fp, "%s", CS addr->address);
-#ifdef EXPERIMENTAL_SRS_ALT
-    if(addr->prop.srs_sender)
-      fprintf(fp, "    [srs = %s]", addr->prop.srs_sender);
-#endif
 
     /* If the address is a duplicate, show something about it. */
 
@@ -3576,10 +3572,12 @@ else
   }
 
 close(pfd[pipe_read]);
+signal(SIGCHLD, oldsignal);
 errno = save_errno;
+return yield;
 
 fail:
-
+DEBUG(D_verify) debug_printf_indent("verify_quota_call fail in %s\n", where);
 return yield;
 }