diff options
Diffstat (limited to 'test/rejectlog')
40 files changed, 242 insertions, 242 deletions
diff --git a/test/rejectlog/0021 b/test/rejectlog/0021 index daf9ee5c9..747ad10cc 100644 --- a/test/rejectlog/0021 +++ b/test/rejectlog/0021 @@ -1,34 +1,34 @@ -1999-03-02 09:44:33 10HmaY-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1 +1999-03-02 09:44:33 10HmaY-000000005vi-0000 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1 Envelope-from: <userx@test1> Envelope-to: <userx@test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <userx@test1>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: userx@test1 Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaZ-0005vi-00 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL Envelope-from: <ok@test2> Envelope-to: <userx@test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <ok@test2>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: ok@test2 Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmbA-0005vi-00 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate +1999-03-02 09:44:33 10HmbA-000000005vi-0000 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate Envelope-from: <ok@test4> Envelope-to: <userx@test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <ok@test4>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: ok@test4 Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 H=[10.9.8.7] U=CALLER rejected connection in "connect" ACL @@ -39,26 +39,26 @@ F From: ok@test4 1999-03-02 09:44:33 U=CALLER rejected connection in "connect" ACL 1999-03-02 09:44:33 H=(x.y.z) [10.9.8.10] U=CALLER rejected EHLO or HELO x.y.z 1999-03-02 09:44:33 mail accepted "mail from:<ok@test3>" "<ok@test3>" -1999-03-02 09:44:33 10HmbB-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1 +1999-03-02 09:44:33 10HmbB-000000005vi-0000 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1 Envelope-from: <userx@test1> Envelope-to: <userx@test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <userx@test1>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> F From: userx@test1 Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmbC-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1 +1999-03-02 09:44:33 10HmbC-000000005vi-0000 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1 Envelope-from: <userx@test1> Envelope-to: <userx@test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <userx@test1>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> F From: userx@test1 Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex diff --git a/test/rejectlog/0026 b/test/rejectlog/0026 index 0499db2f6..5f71734a6 100644 --- a/test/rejectlog/0026 +++ b/test/rejectlog/0026 @@ -1,74 +1,74 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ Envelope-from: <x@y> Envelope-to: <x@y> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 F From: @ -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<x@y> rejected after DATA: '>' missing at end of address: failing address in "To:" header is: <dummy@gmail.com +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<x@y> rejected after DATA: '>' missing at end of address: failing address in "To:" header is: <dummy@gmail.com Envelope-from: <x@y> Envelope-to: <x@y> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 T To: <dummy@gmail.com Subject: incomprehensible F From: <forged@sender.com -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ Envelope-from: <> Envelope-to: <x@y> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 F From: <x@y>, @ -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> 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 +1999-03-02 09:44:33 10HmbA-000000005vi-0000 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 (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 F From: <x@y> -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning -1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger +1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER F=<x@y> rejected after DATA: body contains trigger Envelope-from: <x@y> Envelope-to: <x@y> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <x@y>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> F From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line +1999-03-02 09:44:33 10HmbC-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line Envelope-from: <> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 T to: group name: x@y, p@q; R reply-to: group name:; -I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning diff --git a/test/rejectlog/0027 b/test/rejectlog/0027 index e4d8e5ded..f5b32139d 100644 --- a/test/rejectlog/0027 +++ b/test/rejectlog/0027 @@ -7,36 +7,36 @@ 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 +1999-03-02 09:44:33 10HmaX-000000005vi-0000 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 (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Subject: data1 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@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 +1999-03-02 09:44:33 10HmaY-000000005vi-0000 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 (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Subject: data2 -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@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 +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 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 (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Subject: data3 -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0028 b/test/rejectlog/0028 index 94dc5626c..d30e6ef51 100644 --- a/test/rejectlog/0028 +++ b/test/rejectlog/0028 @@ -1,13 +1,13 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message too big - $recipients=userx@test.ex (1) +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message too big - $recipients=userx@test.ex (1) Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: SIZE value too big diff --git a/test/rejectlog/0162 b/test/rejectlog/0162 index 1bef1ef51..5b114e1b5 100644 --- a/test/rejectlog/0162 +++ b/test/rejectlog/0162 @@ -1,10 +1,10 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: malformed address: ">,\n <u213@shrike.depaul.edu>,\n may not follow <u212@shrike.depaul.edu: failing address in "To:" header begins: <u212@shrike.depaul.edu">,\n <u213@shrike.depaul.edu>,\n <u214@hotmail.com>,\n <u215@hotmail.com>,\n <u216@hotmail.com>,\n <u217@hotmail.com>,\n <u218@hotmail.com>,\n <u219@angelfire.com>,\n <u220@chickmail.com>,\n <u221@excite.com>,\n <u222@chickmail.com>,\n <u223@eudoramail.com>,\n <u224@alleyne.demon.co.uk>,\n <u225@dial.pipex.com>,\n <u226@hotmail.com>,\n <u227@gpu.srv.ualberta.ca>,\n <u228@ulst.ac.uk>,\n <u229@worldnet.att.net>,\n <u230@hotmail.com>,\n <u231@careerbuildermail.com>,\n <u232@MSN.COM>,\n <u233@angelfire.com>,\n <u234@hotmail.com>,\n <u235@hotmail.com>,\n <u236@compuserve.com>,\n <u237@compuserve.com>,\n <u238@hotmail.com>,\n <u239@bellsouth.net>,\n <u240@n64rocks.com>,\n <u241@mailexcite.com>,\n <u242@mailexcite.com>,\n <u243@mailcity.com>,\n <u244@bigfoot.com>,\n <u245@sunbeach.net>,\n <u246@mailcity.com>,\n <u247@pacbell.net>,\n <u248@hotmail.com>,\n <u249@worldnet.att.net>,\n <u250@bigfoot.com>,\n <u251@mailexcite.com>,\n <u252@netnoir.net>,\n <u253@cablecomm1.pcs.mot.com>,\n <u254@compu +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: malformed address: ">,\n <u213@shrike.depaul.edu>,\n may not follow <u212@shrike.depaul.edu: failing address in "To:" header begins: <u212@shrike.depaul.edu">,\n <u213@shrike.depaul.edu>,\n <u214@hotmail.com>,\n <u215@hotmail.com>,\n <u216@hotmail.com>,\n <u217@hotmail.com>,\n <u218@hotmail.com>,\n <u219@angelfire.com>,\n <u220@chickmail.com>,\n <u221@excite.com>,\n <u222@chickmail.com>,\n <u223@eudoramail.com>,\n <u224@alleyne.demon.co.uk>,\n <u225@dial.pipex.com>,\n <u226@hotmail.com>,\n <u227@gpu.srv.ualberta.ca>,\n <u228@ulst.ac.uk>,\n <u229@worldnet.att.net>,\n <u230@hotmail.com>,\n <u231@careerbuildermail.com>,\n <u232@MSN.COM>,\n <u233@angelfire.com>,\n <u234@hotmail.com>,\n <u235@hotmail.com>,\n <u236@compuserve.com>,\n <u237@compuserve.com>,\n <u238@hotmail.com>,\n <u239@bellsouth.net>,\n <u240@n64rocks.com>,\n <u241@mailexcite.com>,\n <u242@mailexcite.com>,\n <u243@mailcity.com>,\n <u244@bigfoot.com>,\n <u245@sunbeach.net>,\n <u246@mailcity.com>,\n <u247@pacbell.net>,\n <u248@hotmail.com>,\n <u249@worldnet.att.net>,\n <u250@bigfoot.com>,\n <u251@mailexcite.com>,\n <u252@netnoir.net>,\n <u253@cablecomm1.pcs.mot.com>,\n <u254@compu Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <u3@test.ex> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for u3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 T To: <u5@compuserve.com>, diff --git a/test/rejectlog/0181 b/test/rejectlog/0181 index ea4814552..4ccbdf838 100644 --- a/test/rejectlog/0181 +++ b/test/rejectlog/0181 @@ -1,12 +1,12 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=225 max=100 +1999-03-02 09:44:33 10HmaX-000000005vi-0000 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=225 max=100 Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaY-0005vi-00 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=101 max=100 +1999-03-02 09:44:33 10HmaY-000000005vi-0000 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=101 max=100 Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@myhost.test.ex> -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0214 b/test/rejectlog/0214 index 5da7cf114..8ffc59beb 100644 --- a/test/rejectlog/0214 +++ b/test/rejectlog/0214 @@ -1,12 +1,12 @@ ******** SERVER ******** -1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=(test) [127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n bad@address;bad@address Envelope-from: <x@y.x> Envelope-to: <x@test.ex> P Received: from [127.0.0.1] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <x@y.x>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 F From: Me <x@y.z> diff --git a/test/rejectlog/0220 b/test/rejectlog/0220 index 0ea1b2a0b..f5c6d23c0 100644 --- a/test/rejectlog/0220 +++ b/test/rejectlog/0220 @@ -1,6 +1,6 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500 +1999-03-02 09:44:33 10HmaX-000000005vi-0000 rejected from <> U=CALLER: message too big: read=501 max=500 Envelope-from: <> Envelope-to: <userx@myhost.test.ex> -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0221 b/test/rejectlog/0221 index 0ea1b2a0b..f5c6d23c0 100644 --- a/test/rejectlog/0221 +++ b/test/rejectlog/0221 @@ -1,6 +1,6 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500 +1999-03-02 09:44:33 10HmaX-000000005vi-0000 rejected from <> U=CALLER: message too big: read=501 max=500 Envelope-from: <> Envelope-to: <userx@myhost.test.ex> -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0227 b/test/rejectlog/0227 index 2a536242a..c2425a16a 100644 --- a/test/rejectlog/0227 +++ b/test/rejectlog/0227 @@ -14,23 +14,23 @@ 1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second 1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377 1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout -1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line Envelope-from: <uncheckable@localhost1> Envelope-to: <z@remote.domain> P Received: from [V4NET.0.0.4] (helo=test ident=root) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <uncheckable@localhost1>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for z@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000 F From: abcd@x.y.z -1999-03-02 09:44:33 10HmaY-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line +1999-03-02 09:44:33 10HmaY-000000005vi-0000 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line Envelope-from: <uncheckable@localhost1> Envelope-to: <z@remote.domain> P Received: from [V4NET.0.0.4] (helo=test ident=root) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <uncheckable@localhost1>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for z@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000 F From: abcd@x.y.z diff --git a/test/rejectlog/0365 b/test/rejectlog/0365 index ac654f9e3..3488604f1 100644 --- a/test/rejectlog/0365 +++ b/test/rejectlog/0365 @@ -1,59 +1,59 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax Envelope-from: <> Envelope-to: <x@y> P Received: from CALLER (helo=test) by the.local.host.name with local-smtp (Exim x.yz) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 F From: <bad@syntax -I Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +I Message-Id: <E10HmaX-000000005vi-0000@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 +1999-03-02 09:44:33 10HmaY-000000005vi-0000 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 (helo=test) by the.local.host.name with local-smtp (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 F From: bad@domain -I Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +I Message-Id: <E10HmaY-000000005vi-0000@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 complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable 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 10HmaZ-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA Envelope-from: <nosyntax@x> Envelope-to: <x@y> P Received: from CALLER (helo=test) by the.local.host.name with local-smtp (Exim x.yz) (envelope-from <nosyntax@x>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 F From: <bad@syntax -I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +I Message-Id: <E10HmaZ-000000005vi-0000@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 +1999-03-02 09:44:33 10HmbA-000000005vi-0000 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 (helo=test) by the.local.host.name with local-smtp (Exim x.yz) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 F From: <unverifiable@y> -I Message-Id: <E10HmbA-0005vi-00@the.local.host.name> +I Message-Id: <E10HmbA-000000005vi-0000@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 complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable 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 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax -1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line +1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax +1999-03-02 09:44:33 10HmbC-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable 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 10HmbD-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA -1999-03-02 09:44:33 10HmbE-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line +1999-03-02 09:44:33 10HmbD-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA +1999-03-02 09:44:33 10HmbE-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line 1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network unreachable 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 diff --git a/test/rejectlog/0451 b/test/rejectlog/0451 index 40b70cef1..5eb660aaa 100644 --- a/test/rejectlog/0451 +++ b/test/rejectlog/0451 @@ -1,24 +1,24 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER sender verify fail for <CALLER@test.ex>: custom message +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER sender verify fail for <CALLER@test.ex>: custom message Envelope-from: <CALLER@test.ex> Envelope-to: <good@test.ex> P Received: from CALLER (helo=a.b.c.d) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@test.ex> rejected after DATA: Sender verify failed +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@test.ex> rejected after DATA: Sender verify failed Envelope-from: <CALLER@test.ex> Envelope-to: <good@test.ex> P Received: from CALLER (helo=a.b.c.d) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0465 b/test/rejectlog/0465 index 9636ffa70..242eee170 100644 --- a/test/rejectlog/0465 +++ b/test/rejectlog/0465 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz. +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz. Envelope-from: <> Envelope-to: <abc@xyz> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000 T To: abc@xyz. -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0468 b/test/rejectlog/0468 index 71c552e71..516a4816a 100644 --- a/test/rejectlog/0468 +++ b/test/rejectlog/0468 @@ -1,24 +1,24 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the FIRST message body. > message end <This is the FIRST message body. > +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the FIRST message body. > message end <This is the FIRST message body. > Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <x@y> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the SECOND message body. > message end <This is the SECOND message body. > +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the SECOND message body. > message end <This is the SECOND message body. > Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <x@y> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0482 b/test/rejectlog/0482 index e29be3469..056ff01ed 100644 --- a/test/rejectlog/0482 +++ b/test/rejectlog/0482 @@ -1,12 +1,12 @@ ******** SERVER ******** -1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@test.ex> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=(foobar) [127.0.0.1] F=<userx@test.ex> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx Envelope-from: <userx@test.ex> Envelope-to: <userx@test.ex> P Received: from [127.0.0.1] (helo=foobar) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <userx@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 F From : userx diff --git a/test/rejectlog/0490 b/test/rejectlog/0490 index 89cfc1b04..0e6e6f2b1 100644 --- a/test/rejectlog/0490 +++ b/test/rejectlog/0490 @@ -1,12 +1,12 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: body contains 2 binary zero characters +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: body contains 2 binary zero characters Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <aa@test.ex> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for aa@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0505 b/test/rejectlog/0505 index 232e4ad24..f2143e206 100644 --- a/test/rejectlog/0505 +++ b/test/rejectlog/0505 @@ -1,25 +1,25 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA: cannot use "control=submission" in DATA ACL +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA: cannot use "control=submission" in DATA ACL Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@x.y> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER temporarily rejected EHLO or HELO xxx: cannot use "control=submission" in EHLO or HELO ACL -1999-03-02 09:44:33 10HmaY-0005vi-00 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: cannot use "control=enforce_sync" in non-SMTP ACL +1999-03-02 09:44:33 10HmaY-000000005vi-0000 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: cannot use "control=enforce_sync" in non-SMTP ACL Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@myhost.test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER temporarily rejected connection in "connect" ACL: cannot use "control=queue" in connection ACL diff --git a/test/rejectlog/0507 b/test/rejectlog/0507 index 3c72ebdfd..71a744cde 100644 --- a/test/rejectlog/0507 +++ b/test/rejectlog/0507 @@ -1,30 +1,30 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@dom.com> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 T To: a@b.c, himself <usery@dom.com>, HIMSELF <USERX@dom.com> -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@dom.com> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 T To: a@b.c, himself <usery@dom.com> -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@dom.com> <usery@dom.com> @@ -32,11 +32,11 @@ Envelope-to: <userx@dom.com> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00; + id 10HmaZ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 T To: a@b.c, himself <usery@dom.com> * Cc: unqualified, userx@dom.com, x@y.z C Cc: unqualified@myhost.test.ex, userx@dom.com, x@y.z -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0536 b/test/rejectlog/0536 index 71c95f7ad..12af19161 100644 --- a/test/rejectlog/0536 +++ b/test/rejectlog/0536 @@ -16,26 +16,26 @@ 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <user31@test.ex>: 490 Main code 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <user32@test.ex>: 490 4.4.3 Main and extended code 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <user33@test.ex>: 451 Wrong code -1999-03-02 09:44:33 10HmaX-0005vi-00 F=<user1@test.ex> rejected by non-SMTP ACL: No code +1999-03-02 09:44:33 10HmaX-000000005vi-0000 F=<user1@test.ex> rejected by non-SMTP ACL: No code Envelope-from: <user1@test.ex> Envelope-to: <user1@myhost.test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <user1@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: user1@test.ex Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaY-0005vi-00 F=<user2@test.ex> rejected by non-SMTP ACL: 599 Main code +1999-03-02 09:44:33 10HmaY-000000005vi-0000 F=<user2@test.ex> rejected by non-SMTP ACL: 599 Main code Envelope-from: <user2@test.ex> Envelope-to: <user1@myhost.test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <user2@test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: user2@test.ex Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user20@test.ex>: No code diff --git a/test/rejectlog/0539 b/test/rejectlog/0539 index a9bff02b4..33809f3c6 100644 --- a/test/rejectlog/0539 +++ b/test/rejectlog/0539 @@ -2,14 +2,14 @@ 1999-03-02 09:44:33 U=CALLER rejected MAIL <both@test.ex> 1999-03-02 09:44:33 U=CALLER F=<ok@test.ex> rejected RCPT <reject@test.ex> 1999-03-02 09:44:33 U=CALLER F=<ok@test.ex> rejected RCPT <both@test.ex> -1999-03-02 09:44:33 10HmaX-0005vi-00 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: Nyet +1999-03-02 09:44:33 10HmaX-000000005vi-0000 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: Nyet Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0562 b/test/rejectlog/0562 index 555ccc9a7..83b2aca0b 100644 --- a/test/rejectlog/0562 +++ b/test/rejectlog/0562 @@ -3,12 +3,12 @@ 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many unrecognized commands (last was "unknown") 1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY foo@bar 1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many nonmail commands (last was "vrfy") -1999-03-02 09:44:33 10HmaX-0005vi-00 H=(abcd) [127.0.0.1] F=<userx@test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=(abcd) [127.0.0.1] F=<userx@test.ex> rejected after DATA Envelope-from: <userx@test.ex> Envelope-to: <userx@test.ex> P Received: from [127.0.0.1] (helo=abcd) by myhost.test.ex with esmtp (Exim x.yz) (envelope-from <userx@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0571 b/test/rejectlog/0571 index 6f6a39750..263e58bea 100644 --- a/test/rejectlog/0571 +++ b/test/rejectlog/0571 @@ -1,11 +1,11 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 F=<ted@29.29.0.com> rejected by non-SMTP ACL: cannot test auto-keyed dnslists condition in non-SMTP ACL +1999-03-02 09:44:33 10HmaX-000000005vi-0000 F=<ted@29.29.0.com> rejected by non-SMTP ACL: cannot test auto-keyed dnslists condition in non-SMTP ACL Envelope-from: <ted@29.29.0.com> Envelope-to: <ok1@test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <ted@29.29.0.com>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for ok1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: ted@29.29.0.com Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0585 b/test/rejectlog/0585 index 5adcf3727..4767d3094 100644 --- a/test/rejectlog/0585 +++ b/test/rejectlog/0585 @@ -1,30 +1,30 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@dom.com> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 T To: b@b.c, himself <usery@dom.com> -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@dom.com> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 T To: c@b.c, himself <usery@dom.com> -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@dom.com> <usery@dom.com> @@ -32,11 +32,11 @@ Envelope-to: <userx@dom.com> P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00; + id 10HmaZ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 T To: e@b.c, himself <UserY@dom.com> * Cc: unqualified, UserX@dom.com, x@y.z C Cc: unqualified@myhost.test.ex, UserX@dom.com, x@y.z -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/2037 b/test/rejectlog/2037 index 76545a37d..b3b597a42 100644 --- a/test/rejectlog/2037 +++ b/test/rejectlog/2037 @@ -2,22 +2,22 @@ ******** SERVER ******** 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex> -1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected after DATA Envelope-from: <> Envelope-to: <data_defer@test.ex> P Received: from localhost ([127.0.0.1] helo=myhost.test.ex) by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Subject: test -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/2137 b/test/rejectlog/2137 index 76545a37d..b3b597a42 100644 --- a/test/rejectlog/2137 +++ b/test/rejectlog/2137 @@ -2,22 +2,22 @@ ******** SERVER ******** 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex> -1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=localhost (myhost.test.ex) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<> temporarily rejected after DATA Envelope-from: <> Envelope-to: <data_defer@test.ex> P Received: from localhost ([127.0.0.1] helo=myhost.test.ex) by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 P Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Subject: test -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/2500 b/test/rejectlog/2500 index d985da2e5..4aa6a77f7 100644 --- a/test/rejectlog/2500 +++ b/test/rejectlog/2500 @@ -1,25 +1,25 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: failed to expand ACL string "accept set acl_m0 = ${lookup {key} dsearch {TESTSUITE/$recipients}}": NULL +1999-03-02 09:44:33 10HmaX-000000005vi-0000 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: failed to expand ACL string "accept set acl_m0 = ${lookup {key} dsearch {TESTSUITE/$recipients}}": NULL Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <tainted@test.ex> P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for tainted@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -1999-03-02 09:44:33 10HmaY-0005vi-00 F=<> rejected by non-SMTP ACL: failed to expand ACL string "accept set acl_m0 = ${lookup {key} dsearch {TESTSUITE/$recipients}}": NULL +1999-03-02 09:44:33 10HmaY-000000005vi-0000 F=<> rejected by non-SMTP ACL: failed to expand ACL string "accept set acl_m0 = ${lookup {key} dsearch {TESTSUITE/$recipients}}": NULL Envelope-from: <> Envelope-to: <CALLER@myhost.test.ex> P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Auto-Submitted: auto-replied F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> T To: CALLER@myhost.test.ex - References: <E10HmaX-0005vi-00@myhost.test.ex> + References: <E10HmaX-000000005vi-0000@myhost.test.ex> Subject: Mail failure - rejected by local scanning code -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/4000 b/test/rejectlog/4000 index e854db0f3..b406cdbae 100644 --- a/test/rejectlog/4000 +++ b/test/rejectlog/4000 @@ -1,10 +1,10 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected during MIME ACL checks: this is a deny from the mime acl +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected during MIME ACL checks: this is a deny from the mime acl Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/4006 b/test/rejectlog/4006 index cd090eae4..dd2c80c0a 100644 --- a/test/rejectlog/4006 +++ b/test/rejectlog/4006 @@ -1,39 +1,39 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: defer this one due to scanner error -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: defer this one due to timeout -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4007 b/test/rejectlog/4007 index 2eb5c383c..9ee304df4 100644 --- a/test/rejectlog/4007 +++ b/test/rejectlog/4007 @@ -1,52 +1,52 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: defer this one, the scanner had an error -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be tmp-rejected due to timeout -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: defer this one, the scanner had an error -I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4008 b/test/rejectlog/4008 index 78227194a..80080ee7c 100644 --- a/test/rejectlog/4008 +++ b/test/rejectlog/4008 @@ -1,26 +1,26 @@ -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be tmp-rejected due to timeout -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4009 b/test/rejectlog/4009 index 5709bc3d6..8e2fb474c 100644 --- a/test/rejectlog/4009 +++ b/test/rejectlog/4009 @@ -1,39 +1,39 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: defer this one -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be tmp-rejected due to timeout -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4010 b/test/rejectlog/4010 index ecc080411..0c5434328 100644 --- a/test/rejectlog/4010 +++ b/test/rejectlog/4010 @@ -1,39 +1,39 @@ -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be tmp-rejected due to timeout -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected as the options are not relevant -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4011 b/test/rejectlog/4011 index 15a85944a..3e474881d 100644 --- a/test/rejectlog/4011 +++ b/test/rejectlog/4011 @@ -1,52 +1,52 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: defer this one (daemon tmp-err) -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected (virus found) -I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be deferred due to timeout -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbC-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected (virus found) -I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4012 b/test/rejectlog/4012 index 1498e324d..56c631b64 100644 --- a/test/rejectlog/4012 +++ b/test/rejectlog/4012 @@ -1,26 +1,26 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be deferred due to timeout -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4013 b/test/rejectlog/4013 index 5960c5d71..00adb9fcc 100644 --- a/test/rejectlog/4013 +++ b/test/rejectlog/4013 @@ -1,26 +1,26 @@ -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be deferred due to timeout -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4014 b/test/rejectlog/4014 index 02d29d2c8..bd075c496 100644 --- a/test/rejectlog/4014 +++ b/test/rejectlog/4014 @@ -1,13 +1,13 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4017 b/test/rejectlog/4017 index a5e565ac3..a5b86c4a8 100644 --- a/test/rejectlog/4017 +++ b/test/rejectlog/4017 @@ -1,52 +1,52 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: defer this one, the scanner had an error -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be rejected -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4506 b/test/rejectlog/4506 index 95df33e74..a0abab081 100644 --- a/test/rejectlog/4506 +++ b/test/rejectlog/4506 @@ -1,12 +1,12 @@ ******** SERVER ******** -1999-03-02 09:44:33 10HmaX-0005vi-00 H=(xxx) [127.0.0.1] rejected DKIM +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=(xxx) [127.0.0.1] rejected DKIM Envelope-from: <shouldfail@bloggs.com> Envelope-to: <a@test.ex> P Received: from [127.0.0.1] (helo=xxx) by myhost.test.ex with smtp (Exim x.yz) (envelope-from <shouldfail@bloggs.com>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 DKIM-Signature: v=1; a=rsa-sha1; c=simple/simple; d=test.ex; h=from:to diff --git a/test/rejectlog/4526 b/test/rejectlog/4526 index 53bae160d..8f77f3bd0 100644 --- a/test/rejectlog/4526 +++ b/test/rejectlog/4526 @@ -1,13 +1,13 @@ ******** SERVER ******** -1999-03-02 09:44:33 10HmaX-0005vi-00 H=(xxx) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no rejected DKIM +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=(xxx) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no rejected DKIM Envelope-from: <shouldfail@bloggs.com> Envelope-to: <a@test.ex> P Received: from [127.0.0.1] (helo=xxx) by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) (envelope-from <shouldfail@bloggs.com>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 DKIM-Signature: v=1; a=rsa-sha1; c=simple/simple; d=test.ex; h=from:to diff --git a/test/rejectlog/5500 b/test/rejectlog/5500 index 21b11203a..174737fd5 100644 --- a/test/rejectlog/5500 +++ b/test/rejectlog/5500 @@ -1,11 +1,11 @@ ******** SERVER ******** -1999-03-02 09:44:33 10HmaX-0005vi-00 H=(rhu.barb) [127.0.0.1] F=<> rejected after DATA +1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=(rhu.barb) [127.0.0.1] F=<> rejected after DATA Envelope-from: <> Envelope-to: <userp@test.ex> <userq@test.ex> P Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 S Sender: sender@some.where |