Retries: rework DB keys, and fix exinext IPv6. Bug 3086

[exim.git] / test / stdout / 0372

diff --git a/test/stdout/0372 b/test/stdout/0372
index 7639176a46367b7a706b8d909279894bc190e088..76372708ea949562168c20086dd45ba8132d6862 100644 (file)
--- a/test/stdout/0372
+++ b/test/stdout/0372
@@ -1,18 +1,20 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 host.name [1.2.3.4]\r

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

 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
 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 host2.name [4.3.2.1]\r

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

 221 myhost.test.ex closing connection\r
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 221 myhost.test.ex closing connection\r
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220


@@ -31,6 +33,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 354 Enter message, ending with "." on a line by itself
 >>> .
 ??? 250
 <<< 354 Enter message, ending with "." on a line by itself
 >>> .
 ??? 250

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

 >>> QUIT
 End of script
 >>> QUIT
 End of script