Save/restore $acl_arg1 ... across acl calls, making them local variables.

[exim.git] / test / rejectlog / 0027

diff --git a/test/rejectlog/0027 b/test/rejectlog/0027
index bff8a746c25d28d0cdc5d95c1f5008062d4679ed..24bcc70e95a57a2d864fa95142769a2f8a3b17fc 100644 (file)
--- a/test/rejectlog/0027
+++ b/test/rejectlog/0027
@@ -2,35 +2,35 @@
 1999-03-02 09:44:33 U=CALLER sender verify fail for <x@y>: Unrouteable address
 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <postmaster@test.ex>: Sender verify failed
 1999-03-02 09:44:33 U=CALLER F=<userx@test.ex> rejected RCPT <userx@test.ex>: deny for userx
-1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = header_syntax"@test.ex>: cannot check header contents in ACL for RCPT (only possible in ACL for DATA)
+1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = header_syntax"@test.ex>: cannot verify header_syntax in ACL for RCPT
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = junk"@test.ex>: expected "sender[=address]", "recipient", "helo", "header_syntax", "header_sender" or "reverse_host_lookup" at start of ACL condition "verify junk"
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny vorify = junk"@test.ex>: unknown ACL condition/modifier in "deny vorify = junk"
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@test.ex>: unknown ACL verb "dony" in "dony verify = junk"
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny !message = abcd"@test.ex>: ACL error: negation is not allowed with "message"
-1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA (only possible for RCPT)
+1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Subject: data1
+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
   Subject: data2
+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test local_parts condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
   Subject: data3
+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000