DKIM: rework error logging to pass strings back to caller for logging. Bug 966

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

diff --git a/src/src/daemon.c b/src/src/daemon.c
index d4fe7759c92162862aa1cb4d9317e5854138cbe4..e9ecbe7d6e1106a096ef3e3be416a38708593d12 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -542,9 +542,9 @@ if (pid == 0)
     DEBUG(D_receive)
       {
       int i;
-      if (sender_address != NULL)
+      if (sender_address)
         debug_printf("Sender: %s\n", sender_address);
-      if (recipients_list != NULL)
+      if (recipients_list)
         {
         debug_printf("Recipients:\n");
         for (i = 0; i < recipients_count; i++)
@@ -573,6 +573,7 @@ if (pid == 0)
 #ifndef DISABLE_DKIM
     dkim_cur_signer = NULL;
 #endif
+    acl_var_m = NULL;
     store_reset(reset_point);
 
     /* If queue_only is set or if there are too many incoming connections in