DMARC: Fix forensic-report envelopes to permit non-null. Bug 1896

[exim.git] / src / src / dkim.c

diff --git a/src/src/dkim.c b/src/src/dkim.c
index edbeded5e4ac886885d37847e9f9b12219f2d568..4d1822e2e12a09dede66e02876db68cefd325fdb 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -306,7 +306,7 @@ if (dkim_collect_error)
   log_write(0, LOG_MAIN,
       "DKIM: Error during validation, disabling signature verification: %.100s",
       dkim_collect_error);
-  dkim_disable_verify = TRUE;
+  f.dkim_disable_verify = TRUE;
   goto out;
   }
 
@@ -381,7 +381,7 @@ dkim_verify_status = US"none";
 dkim_verify_reason = US"";
 dkim_cur_signer = id;
 
-if (dkim_disable_verify || !id || !dkim_verify_ctx)
+if (f.dkim_disable_verify || !id || !dkim_verify_ctx)
   return OK;
 
 /* Find signatures to run ACL on */
@@ -453,7 +453,7 @@ switch (what)
 uschar *
 dkim_exim_expand_query(int what)
 {
-if (!dkim_verify_ctx || dkim_disable_verify || !dkim_cur_sig)
+if (!dkim_verify_ctx || f.dkim_disable_verify || !dkim_cur_sig)
   return dkim_exim_expand_defaults(what);
 
 switch (what)
@@ -702,7 +702,7 @@ if (dkim_domain)
        { errwhen = US"dkim_timestamps"; goto expand_bad; }
       else
        xval = (tval = (unsigned long) time(NULL))
-             + strtoul(dkim_timestamps_expanded, NULL, 10);
+             + strtoul(CCS dkim_timestamps_expanded, NULL, 10);
 
     if (!(sig = pdkim_init_sign(&dkim_sign_ctx, dkim_signing_domain,
                          dkim_signing_selector,