From d342446f29e81eddd4845cbf23e9454b9fc406e2 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 6 Apr 2018 10:48:00 +0100 Subject: Logging: fix DKIM precis received log line element. Broken-by: 2c47372fad --- src/src/receive.c | 4 ++-- src/src/smtp_in.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/src/receive.c b/src/src/receive.c index 4e1dca5c5..cba53c20d 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -1617,8 +1617,8 @@ int i; int rc = FAIL; int msg_size = 0; int process_info_len = Ustrlen(process_info); -int error_rc = (error_handling == ERRORS_SENDER)? - errors_sender_rc : EXIT_FAILURE; +int error_rc = error_handling == ERRORS_SENDER + ? errors_sender_rc : EXIT_FAILURE; int header_size = 256; int start, end, domain; int id_resolution; diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 7d6298160..db9fb6879 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -1995,8 +1995,13 @@ bmi_verdicts = NULL; #endif dnslist_domain = dnslist_matched = NULL; #ifndef DISABLE_DKIM -dkim_cur_signer = dkim_signers = NULL; +dkim_cur_signer = dkim_signers = +dkim_signing_domain = dkim_signing_selector = NULL; +dkim_cur_signer = dkim_signers = dkim_signing_domain = dkim_signing_selector = NULL; dkim_disable_verify = dkim_collect_input = FALSE; +dkim_verify_overall = dkim_verify_status = dkim_verify_reason = NULL; +dkim_key_length = 0; +dkim_verify_signers = US"$dkim_signers"; #endif dsn_ret = 0; dsn_envid = NULL; -- cgit v1.2.3