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
Pass on SIZE to cutthrough connection
[exim.git]
/
src
/
src
/
daemon.c
diff --git
a/src/src/daemon.c
b/src/src/daemon.c
index 2d10387f6345fd21706cee946431ceeefe20c722..f2c8dbfaf1d71b154aa61d44f0dcf50dc423d4b9 100644
(file)
--- a/
src/src/daemon.c
+++ b/
src/src/daemon.c
@@
-341,6
+341,7
@@
arrange to unset the selector in the subprocess. */
if (LOGGING(smtp_connection))
{
uschar *list = hosts_connection_nolog;
if (LOGGING(smtp_connection))
{
uschar *list = hosts_connection_nolog;
+ memset(sender_host_cache, 0, sizeof(sender_host_cache));
if (list != NULL && verify_check_host(&list) == OK)
save_log_selector &= ~L_smtp_connection;
else
if (list != NULL && verify_check_host(&list) == OK)
save_log_selector &= ~L_smtp_connection;
else
@@
-735,6
+736,7
@@
else (void)close(dup_accept_socket);
/* Release any store used in this process, including the store used for holding
the incoming host address and an expanded active_hostname. */
/* Release any store used in this process, including the store used for holding
the incoming host address and an expanded active_hostname. */
+log_close_all();
store_reset(reset_point);
sender_host_address = NULL;
}
store_reset(reset_point);
sender_host_address = NULL;
}
@@
-1602,7
+1604,7
@@
if (inetd_wait_mode)
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, launched with listening socket, %s",
version_string, getpid(), big_buffer);
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, launched with listening socket, %s",
version_string, getpid(), big_buffer);
- set_process_info("daemon
: pre-listening socket"
);
+ set_process_info("daemon
(%s): pre-listening socket", version_string
);
/* set up the timeout logic */
sigalrm_seen = 1;
/* set up the timeout logic */
sigalrm_seen = 1;
@@
-1687,7
+1689,7
@@
else if (daemon_listen)
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, %s, listening for %s",
version_string, getpid(), qinfo, big_buffer);
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, %s, listening for %s",
version_string, getpid(), qinfo, big_buffer);
- set_process_info("daemon
: %s, listening for %s"
, qinfo, big_buffer);
+ set_process_info("daemon
(%s): %s, listening for %s", version_string
, qinfo, big_buffer);
}
else
}
else
@@
-1695,14
+1697,14
@@
else
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, -q%s, not listening for SMTP",
version_string, getpid(), readconf_printtime(queue_interval));
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, -q%s, not listening for SMTP",
version_string, getpid(), readconf_printtime(queue_interval));
- set_process_info("daemon: -q%s, not listening",
+ set_process_info("daemon(%s): -q%s, not listening",
+ version_string,
readconf_printtime(queue_interval));
}
/* Do any work it might be useful to amortize over our children
(eg: compile regex) */
readconf_printtime(queue_interval));
}
/* Do any work it might be useful to amortize over our children
(eg: compile regex) */
-deliver_init();
dns_pattern_init();
#ifdef WITH_CONTENT_SCAN
dns_pattern_init();
#ifdef WITH_CONTENT_SCAN