Move from table to tree for lookups

[exim.git] / test / stdout / 4017

diff --git a/test/stdout/4017 b/test/stdout/4017
index 7d731ae90d49c66437fcfddf9c30ac09032e67ba..92ce85fe4d2816dcca0ac7c67b60a4a850fbbf1e 100644 (file)
--- a/test/stdout/4017
+++ b/test/stdout/4017
@@ -2,18 +2,20 @@
 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 OK id=10HmbB-0005vi-00\r
+250 OK id=10HmbB-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
 ### scanner tmpfail -> defer
 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
@@ -25,6 +27,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
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -36,6 +39,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
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -47,6 +51,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
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -58,13 +63,14 @@
 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 OK id=10HmbC-0005vi-00\r
+250 OK id=10HmbC-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
@@ -77,7 +83,7 @@ Connection request
 >LF>FLAGS -fullfiles
 >LF>FLAGS +extra
 >LF>200 FLAGS OK
-<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmbB-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/clean1\x09[+]
 >LF>/bin/clean2\x09[+]
@@ -89,7 +95,7 @@ End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmaX-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/error\x09[E]0.0\x09Error 13 Permission\\ denied
 >LF>451 SCAN Engine error 13 Permission denied
@@ -99,7 +105,7 @@ End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmaY-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmaY-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/clean\x09[+]
 >LF>v\\ i\\ a\\ r\\ u\\ s\x09[L]9.0\x090 This\\ is\\ not\\ even\\ an\\ EICAR\\ test\\ virus.
@@ -110,7 +116,7 @@ End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmaZ-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmaZ-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/clean\x09[+]
 >LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb
@@ -122,7 +128,7 @@ End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmbA-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/clean\x09[+]
 >LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb
@@ -133,7 +139,7 @@ End of script
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmbC-000000005vi-0000
 >LF>210 SCAN DATA
 >LF>/bin/clean\x09[+]
 >LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb