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

[exim.git] / test / rejectlog / 0365

diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 30b7ac01f0648a7218a3719696b4dd09f6ea3a7d..5dbe6259ac873d6840346ccf2b4b8b5e5a380669 100644 (file)
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -4,18 +4,18 @@ Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 F From: <bad@syntax
 F From: <bad@syntax

+I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

 F From: bad@domain
 F From: bad@domain

+I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA


@@ -25,18 +25,18 @@ P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <nosyntax@x>)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <nosyntax@x>)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

 F From: <bad@syntax
 F From: <bad@syntax

+I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-  Date: Tue, 2 Mar 1999 09:44:33 +0000
-I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

 F From: <unverifiable@y>
 F From: <unverifiable@y>

+I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
 1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message