X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0c6608531368096bafebac4e488f84891368b006..4e19eed51a7f777e1e18b60c636e0c9bfb82c23b:/test/stderr/0303?ds=sidebyside

diff --git a/test/stderr/0303 b/test/stderr/0303
index 02875c77d..60c8bba97 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -29,6 +29,8 @@
 >>> IP address lookup yielded "ten-1.test.ex"
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
@@ -82,6 +84,8 @@ SMTP<< EHLO [V4NET.2.3.4]
 sender_fullhost = ([V4NET.2.3.4]) [V4NET.2.3.4]
 sender_rcvhost = [V4NET.2.3.4]
 set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.2.3.4]
+ list element: *
+  host in limits_advertise_hosts? yes (matched "*")
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
@@ -90,6 +94,7 @@ host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
        250-SIZE 52428800
+       250-LIMITS MAILMAX=1000 RCPTMAX=50000
        250-8BITMIME
        250-PIPELINING
        250 HELP
@@ -108,27 +113,27 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
-Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
-Data file written for message 10HmaX-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+Data file written for message 10HmaX-000000005vi-0000
 >>Generated Received: header line
 P Received: from [V4NET.2.3.4]
 	by myhost.test.ex with esmtp (Exim x.yz)
-	id 10HmaX-0005vi-00
+	id 10HmaX-000000005vi-0000
 	for x@y;
 	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss
-SMTP>> 250 OK id=10HmaX-0005vi-00
+SMTP>> 250 OK id=10HmaX-000000005vi-0000
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] closed by QUIT
+  SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -162,6 +167,8 @@ SMTP<< EHLO [V4NET.2.3.4]
 sender_fullhost = host.name.tld [V4NET.2.3.4]
 sender_rcvhost = host.name.tld ([V4NET.2.3.4])
 set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.3.4]
+ list element: *
+  host in limits_advertise_hosts? yes (matched "*")
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
@@ -170,6 +177,7 @@ host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
        250-SIZE 52428800
+       250-LIMITS MAILMAX=1000 RCPTMAX=50000
        250-8BITMIME
        250-PIPELINING
        250 HELP
@@ -188,26 +196,26 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
-Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
-Data file written for message 10HmaY-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
+Data file written for message 10HmaY-000000005vi-0000
 >>Generated Received: header line
 P Received: from host.name.tld ([V4NET.2.3.4])
 	by myhost.test.ex with esmtp (Exim x.yz)
-	id 10HmaY-0005vi-00
+	id 10HmaY-000000005vi-0000
 	for x@y;
 	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss
-SMTP>> 250 OK id=10HmaY-0005vi-00
+SMTP>> 250 OK id=10HmaY-000000005vi-0000
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT
+  SMTP connection from host.name.tld [V4NET.2.3.4] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>