summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-04-06 10:48:00 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2018-04-06 10:49:53 +0100
commitd342446f29e81eddd4845cbf23e9454b9fc406e2 (patch)
tree0c6265520174b005070cb08dfe862e48c1c2d274 /src
parent4fe93c4bc6c88133432e141c790886d4c058c07c (diff)
Logging: fix DKIM precis received log line element.
Broken-by: 2c47372fad
Diffstat (limited to 'src')
-rw-r--r--src/src/receive.c4
-rw-r--r--src/src/smtp_in.c7
2 files changed, 8 insertions, 3 deletions
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;