X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fdkim.c;h=2a06dee9274dea2d34725ee92c7faf7ad128ad8e;hb=33191679e1a86ba6d9c38a74d0795d00c300f2c5;hp=f88f910f97a452c1c6027ce4f8816a59f6d2a783;hpb=db4d09028d12130b489cb7d5380641f3a61305af;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/dkim.c b/src/src/dkim.c
index f88f910f9..2a06dee92 100644
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.c,v 1.13 2010/02/19 10:30:13 michael Exp $ */
+/* $Cambridge: exim/src/src/dkim.c,v 1.15 2010/06/12 13:54:38 jetmore Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -92,7 +92,7 @@ void dkim_exim_verify_finish(void) {
      means there was a processing error somewhere along the way.
      Log the incident and disable futher verification. */
   if (!dkim_collect_input) {
-    log_write(0, LOG_MAIN|LOG_PANIC, "DKIM: Error while running this message through validation, disabling signature verification.");
+    log_write(0, LOG_MAIN, "DKIM: Error while running this message through validation, disabling signature verification.");
     dkim_disable_verify = TRUE;
     return;
   }
@@ -467,7 +467,10 @@ uschar *dkim_exim_sign(int dkim_fd,
         goto CLEANUP;
       }
     }
-    /* else pass NULL, which means default header list */
+    else {
+      /* pass NULL, which means default header list */
+      dkim_sign_headers_expanded = NULL;
+    }
 
     /* Get private key to use. */
     dkim_private_key_expanded = expand_string(dkim_private_key);