ARC: add independent-source testcase. Fix signatures by not line-terminating

[user/henk/code/exim.git] / src / src / acl.c

diff --git a/src/src/acl.c b/src/src/acl.c
index f0d78d3ef833b684c7dbd549cda05d780515cfd1..35d955da6a2c584f52cbac5ca66de755c59a8fa5 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1698,7 +1698,8 @@ switch(vp->value)
     uschar * cond;
 
     if (!(arc_state = acl_verify_arc())) return DEFER;
-    DEBUG(D_acl) debug_printf_indent("ARC verify result %s\n", arc_state);
+    DEBUG(D_acl) debug_printf_indent("ARC verify result %s %s%s%s\n", arc_state,
+      arc_state_reason ? "(":"", arc_state_reason, arc_state_reason ? ")":"");
 
     if (!condlist) condlist = US"none:pass";
     while ((cond = string_nextinlist(&condlist, &csep, NULL, 0)))
@@ -4476,7 +4477,7 @@ switch (where)
   }
 
 deliver_domain = deliver_localpart = deliver_address_data =
-  sender_address_data = NULL;
+  deliver_domain_data = sender_address_data = NULL;
 
 /* A DISCARD response is permitted only for message ACLs, excluding the PREDATA
 ACL, which is really in the middle of an SMTP command. */