Log: more info in ACL "warn statement skipped" message. Bug 2897

[exim.git] / test / stdout / 4013

diff --git a/test/stdout/4013 b/test/stdout/4013
index dd4eddeee147e6a06ac1076dd6d0efe3d1ff967b..533a9a52be6f3e6040fcf8533bb5747cd1034dae 100644 (file)
--- a/test/stdout/4013
+++ b/test/stdout/4013
@@ -1,17 +1,19 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmbA-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r


@@ -23,6 +25,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r


@@ -34,35 +37,36 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]

-<SCAN FILE TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml
+<SCAN FILE TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml

 >0 <clean>
 >*eof
 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]
 >0 <clean>
 >*eof
 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]

-<SCAN FILE TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml
->0 <infected: EICAR_Test_File> DIR/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml
+<SCAN FILE TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/10HmaZ-000000005vi-0000.eml
+>0 <infected: EICAR_Test_File> DIR/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml

 >*eof
 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]
 >*eof
 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]

-<SCAN FILE TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml
+<SCAN FILE TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml

 *sleep 3
 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]
 *sleep 3
 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]

-<SCAN FILE TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml
+<SCAN FILE TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000.eml

 *sleep 3
 End of script
 *sleep 3
 End of script