Transports: pass back next id for continued-transport

[exim.git] / test / stderr / 0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index 0bf77157b42f4913005e16560259acb16ab89690..6795f8dac51509630c0590f90cfd500a6b00136e 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config


@@ -28,8 +29,6 @@ check set acl_c9 = $acl_c9; connect
                  = ; connect
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
                  = ; connect
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT

-host in pipelining_connect_advertise_hosts?
- list element: 

 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo something
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo something


@@ -40,17 +39,17 @@ something in helo_lookup_domains? no (end of list)
 sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
 sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]

-host in limits_advertise_hosts?
- list element: !*
+ list element: *
+  host in limits_advertise_hosts? yes (matched "*")

 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
   host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts?
  list element: *
   host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts?
 host in chunking_advertise_hosts? no (end of list)

-host in tls_advertise_hosts?

 SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
        250-SIZE 52428800
 SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
        250-SIZE 52428800

+       250-LIMITS MAILMAX=1000 RCPTMAX=50000

        250-8BITMIME
        250-VRFY
        250-PIPELINING
        250-8BITMIME
        250-VRFY
        250-PIPELINING


@@ -87,18 +86,18 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
 >>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:
 
 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.0.0.0] (helo=something)
        by mail.test.ex with esmtp (Exim x.yz)
        (envelope-from <x@y>)
 >>Generated Received: header line
 P Received: from [V4NET.0.0.0] (helo=something)
        by mail.test.ex with esmtp (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
 using ACL "data"
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "data"


@@ -111,7 +110,7 @@ accept: condition test succeeded in ACL "data"
 end of ACL "data": ACCEPT
 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
 end of ACL "data": ACCEPT
 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss

-SMTP>> 250 OK id=10HmaX-0005vi-00
+SMTP>> 250 OK id=10HmaX-000000005vi-0000

 smtp_setup_msg entered
 SMTP<< vrfy x@y
 host in smtp_accept_max_nonmail_hosts?
 smtp_setup_msg entered
 SMTP<< vrfy x@y
 host in smtp_accept_max_nonmail_hosts?


@@ -154,6 +153,6 @@ SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
+  SMTP connection from (something) [V4NET.0.0.0] D=qqs closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>