ARC: options on the verify

diff --git a/src/src/acl.c b/src/src/acl.c
index 4be5e071a4550514a4fa2a1fda3c7f8903014c70..97ba0942e5c795b74da521bda91dd0c19ba84b46 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1543,7 +1543,7 @@ static verify_type_t verify_type_list[] = {
     { US"recipient",           VERIFY_RCPT,            ACL_BIT_RCPT,   FALSE, 0 },
     { US"header_names_ascii",  VERIFY_HDR_NAMES_ASCII, ACL_BIT_DATA | ACL_BIT_NOTSMTP, TRUE, 0 },
 #ifdef EXPERIMENTAL_ARC
-    { US"arc",                 VERIFY_ARC,             ACL_BIT_DATA,   TRUE , 0 },
+    { US"arc",                 VERIFY_ARC,             ACL_BIT_DATA,   FALSE , 0 },
 #endif
   };
 

diff --git a/test/confs/4560 b/test/confs/4560
index c80148b3e10ea876d3a9e90c9cbe649a669f8d46..881b2d7266e8a3bb4788f266fa7215236d1a65f6 100644 (file)
--- a/test/confs/4560
+++ b/test/confs/4560
@@ -1,6 +1,8 @@
 # Exim test configuration 4560
 
 SERVER=
+VALUE=
+INSERT=
 
 .include DIR/aux-var/std_conf_prefix
 
@@ -18,7 +20,9 @@ queue_only
 begin acl
 
 check_data:
-  warn !verify =       arc
+  warn !verify =       arc VALUE
+       INSERT
+
 .ifdef OPTION
   accept
 .else

diff --git a/test/log/4560 b/test/log/4560
index 1098ab0869098bc422d07f22918b497c396c6fc9..433927317124ffc3c300e134e8dd039f9d03562b 100644 (file)
--- a/test/log/4560
+++ b/test/log/4560
@@ -100,3 +100,6 @@
 1999-03-02 09:44:33 10HmbP-0005vi-00 => a <a@test.ex> R=d1 T=tfile
 1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 10HmbQ-0005vi-00 H=(xxx) [127.0.0.1] Warning: ARC-FAIL
+1999-03-02 09:44:33 10HmbQ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss for a@test.ex

diff --git a/test/scripts/4560-ARC/4560 b/test/scripts/4560-ARC/4560
index 2d23674c7419e471943ad97d3bf0b36593a32ee3..3e0f8e922a08e132b447756e876562b301280cd4 100644 (file)
--- a/test/scripts/4560-ARC/4560
+++ b/test/scripts/4560-ARC/4560
@@ -347,13 +347,37 @@ exim -DSERVER=server -DNOTDAEMON -q
 #
 #
 #
+killdaemon
 #
+exim -DSERVER=server -DVALUE=/pass -DINSERT='log_message=ARC-FAIL' -bd -oX PORT_D
+****
 #
+# We just send this in for reception, bare, to check the "arc" verify can take options
+#
+client 127.0.0.1 PORT_D
+??? 220
+HELO xxx
+??? 250
+MAIL FROM:<CALLER@bloggs.com>
+??? 250
+RCPT TO:<a@test.ex>
+??? 250
+DATA
+??? 354
+Subject: Test
+
+This is a test body.
+.
+??? 250
+QUIT
+??? 221
+****
 #
 #
 #
 #
-killdaemon
 #
+#
+killdaemon
 no_stdout_check
 no_msglog_check