Merge branch 'router_dynamic_modules'

[exim.git] / test / stdout / 0022

diff --git a/test/stdout/0022 b/test/stdout/0022
index 6dba84034b8e13f963386dd99f5b8d4758423fc8..e7a1bc6d722782b87789833babce4549bfd92aed 100644 (file)
--- a/test/stdout/0022
+++ b/test/stdout/0022
@@ -4,10 +4,11 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbF-0005vi-00\r
+250 OK id=10HmbF-000000005vi-0000\r
 
 **** SMTP testing: that is not a real message id!
 
@@ -18,10 +19,11 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbG-0005vi-00\r
+250 OK id=10HmbG-000000005vi-0000\r
 
 **** SMTP testing: that is not a real message id!
 
@@ -32,10 +34,11 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbH-0005vi-00\r
+250 OK id=10HmbH-000000005vi-0000\r
 
 **** SMTP testing: that is not a real message id!
 
@@ -46,6 +49,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 451 forcibly deferred\r
 250 Accepted\r
@@ -56,6 +60,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
@@ -65,6 +70,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
@@ -75,6 +81,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 550 host data >A host-specific message<\r
 550 host data >A host-specific message<\r
@@ -82,24 +89,25 @@
 550 host data >A host-specific message<\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\r
 250 OK\r
 250 Accepted\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
 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
 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
 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
 
 **** SMTP testing session as if from host V4NET.9.8.7
@@ -107,6 +115,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 550 forcibly dropped\r
 
@@ -115,19 +124,23 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.9.8.7]\r
 250 OK\r
 550 forcibly dropped\r
- 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen ***
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen ***
           accept@y
           freeze@y
 
- 0m   sss 10HmaZ-0005vi-00 <CALLER@test.ex>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@test.ex>
           queue_only@y
           accept@y
 
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
 >>> mail from:<x@y>
 ??? 250
 <<< 250 OK
@@ -144,7 +157,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Testing
 >>> .
 ??? 250
-<<< 250 OK id=10HmbB-0005vi-00
+<<< 250 OK id=10HmbB-000000005vi-0000
 >>> mail from:<x@y>
 ??? 250
 <<< 250 OK
@@ -158,7 +171,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Testing 2
 >>> .
 ??? 250
-<<< 250 OK id=10HmbC-0005vi-00
+<<< 250 OK id=10HmbC-000000005vi-0000
 >>> mail from:<x@y>
 ??? 250
 <<< 250 OK
@@ -175,7 +188,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Testing 3
 >>> .
 ??? 250
-<<< 250 OK id=10HmbD-0005vi-00
+<<< 250 OK id=10HmbD-000000005vi-0000
 >>> mail from:<x@y>
 ??? 250
 <<< 250 OK
@@ -189,7 +202,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> Testing 4
 >>> .
 ??? 250
-<<< 250 OK id=10HmbE-0005vi-00
+<<< 250 OK id=10HmbE-000000005vi-0000
 >>> mail from:<x@y>
 ??? 250
 <<< 250 OK
@@ -200,25 +213,31 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 221
 <<< 221 myhost.test.ex closing connection
 End of script
- 0m   sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen ***
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen ***
           accept@y
           freeze@y
 
- 0m   sss 10HmaZ-0005vi-00 <CALLER@test.ex>
+TTT   sss 10HmaZ-000000005vi-0000 <CALLER@test.ex>
           queue_only@y
           accept@y
 
- 0m   sss 10HmbB-0005vi-00 <x@y> *** frozen ***
+TTT   sss 10HmbB-000000005vi-0000 <x@y> *** frozen ***
           accept@y
           freeze@y
 
- 0m   sss 10HmbC-0005vi-00 <x@y>
+TTT   sss 10HmbC-000000005vi-0000 <x@y>
           accept@y
 
- 0m   sss 10HmbD-0005vi-00 <x@y>
+TTT   sss 10HmbD-000000005vi-0000 <x@y>
           queue_only@y
           accept@y
 
- 0m   sss 10HmbE-0005vi-00 <x@y>
+TTT   sss 10HmbE-000000005vi-0000 <x@y>
           accept@y
 
+Connecting to 127.0.0.1 port 1225 ... connected
+??? 550 client disliked
+<<< 550 client disliked
+???*
+Expected EOF read
+End of script