git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Retire old libsrs_alt -based SRS support. Bug 1649
[exim.git]
/
src
/
src
/
verify.c
diff --git
a/src/src/verify.c
b/src/src/verify.c
index 6e07566a7edc78fa0611b02c1cf422cffbc983f7..a5c6de576d002004593fea290f14db50159e6dd3 100644
(file)
--- a/
src/src/verify.c
+++ b/
src/src/verify.c
@@
-3,7
+3,7
@@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
*************************************************/
/* 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
/* 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,
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;
#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)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
}
}
#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);
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. */
/* If the address is a duplicate, show something about it. */
@@
-3576,10
+3572,12
@@
else
}
close(pfd[pipe_read]);
}
close(pfd[pipe_read]);
+signal(SIGCHLD, oldsignal);
errno = save_errno;
errno = save_errno;
+return yield;
fail:
fail:
-
+DEBUG(D_verify) debug_printf_indent("verify_quota_call fail in %s\n", where);
return yield;
}
return yield;
}