TLS: fix resumption for TLS-on-connect

[exim.git] / test / stdout / 4011

diff --git a/test/stdout/4011 b/test/stdout/4011
index db7a98ebea22e58130c8619bcb81b544564e6bb9..04a7ad4a53b6f8e9f8693afa25d73f32526c1bf4 100644 (file)
--- a/test/stdout/4011
+++ b/test/stdout/4011
@@ -7,7 +7,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbD-0005vi-00\r
+250 OK id=10HmbD-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
 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


@@ -51,7 +51,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-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
 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


@@ -62,7 +62,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\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
 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


@@ -80,7 +80,7 @@
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >200 ready
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >200 ready

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

 >200 done
 <quit
 >200 ready
 >200 done
 <quit
 >200 ready


@@ -89,7 +89,7 @@ End of script
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >2xx ready
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >2xx ready

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

 >5xx defer
 <quit
 >2xx ready
 >5xx defer
 <quit
 >2xx ready


@@ -98,7 +98,7 @@ End of script
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >2xx ready
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >2xx ready

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

 >322 VNAME found
 >2xx ready
 <quit
 >322 VNAME found
 >2xx ready
 <quit


@@ -116,7 +116,7 @@ End of script
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >2xx ready
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >2xx ready

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

 >5xx defer
 <quit
 >2xx ready
 >5xx defer
 <quit
 >2xx ready


@@ -125,7 +125,7 @@ End of script
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >2xx ready
 Listening on TESTSUITE/eximdir/aveserver_sock ... 
 Connection request
 >2xx ready

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

 >322 VNAME found
 >2xx ready
 <quit
 >322 VNAME found
 >2xx ready
 <quit