Callouts: fix recipient verify/random

[exim.git] / test / stdout / 0473

diff --git a/test/stdout/0473 b/test/stdout/0473
index 00112d38d24af9e43de10d520fd30b6886456a18..eda29bd92fd3c38ae9e10015d5d3d7c70c9aa368 100644 (file)
--- a/test/stdout/0473
+++ b/test/stdout/0473
@@ -92,6 +92,7 @@
 250 Accepted\r
 221 the.local.host.name closing connection\r
 +++++++++++++++++++++++++++
+07-Mar-2000 12:21:52 other.ex callout=accept postmaster=unknown random=unknown
 07-Mar-2000 12:21:52 r1@test.ex callout=accept
 07-Mar-2000 12:21:52 r1@test.ex/<postmaster@the.local.host.name> callout=accept
 07-Mar-2000 12:21:52 r1@test.ex/<s1@test.ex> callout=accept
@@ -107,6 +108,27 @@
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
+250 Accepted\r
+221 the.local.host.name closing connection\r
++++++++++++++++++++++++++++
+07-Mar-2000 12:21:52 other.ex callout=accept postmaster=unknown random=unknown
+07-Mar-2000 12:21:52 r12@three.test.ex callout=accept
+07-Mar-2000 12:21:52 r1@test.ex callout=accept
+07-Mar-2000 12:21:52 r1@test.ex/<postmaster@the.local.host.name> callout=accept
+07-Mar-2000 12:21:52 r1@test.ex/<s1@test.ex> callout=accept
+07-Mar-2000 12:21:52 r1@test.ex/<s2@test.ex> callout=accept
+07-Mar-2000 12:21:52 r9@test.ex/<x9@test.ex> callout=reject
+07-Mar-2000 12:21:52 test.ex callout=accept postmaster=unknown random=unknown
+07-Mar-2000 12:21:52 three.test.ex callout=accept postmaster=unknown random=reject (07-Mar-2000 12:21:52)
+07-Mar-2000 12:21:52 two.test.ex callout=accept postmaster=unknown random=accept (07-Mar-2000 12:21:52)
+07-Mar-2000 12:21:52 x9@test.ex callout=reject
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-the.local.host.name Hello CALLER at xxxx\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250 HELP\r
+250 OK\r
 451 Could not complete recipient verify callout\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
@@ -123,7 +145,7 @@
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Server ready
-HELO the.local.host.name
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<s1@test.ex>
 250 OK
@@ -135,7 +157,7 @@ Expected EOF read from client
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Server ready
-HELO the.local.host.name
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<s2@test.ex>
 250 OK
@@ -147,7 +169,7 @@ Expected EOF read from client
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Server ready
-HELO the.local.host.name
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<s3@other.ex>
 550 NOTOK
@@ -157,7 +179,7 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Server ready
-HELO the.local.host.name
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<>
 250 OK
@@ -169,7 +191,7 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Server ready
-HELO the.local.host.name
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<postmaster@the.local.host.name>
 250 OK
@@ -181,7 +203,7 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 server ready
-HELO the.local.host.name
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<x9@test.ex>
 250 OK
@@ -193,7 +215,7 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 server ready
-HELO the.local.host.name
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<>
 250 OK
@@ -205,7 +227,7 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Server ready
-HELO the.local.host.name
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<postmaster@the.local.host.name>
 250 OK
@@ -217,7 +239,29 @@ End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Server ready
-HELO the.local.host.name
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<the.local.host.name--testing@three.test.ex>
+550 Bad receipient, dropping conn
+>*eof
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
+250 OK
+MAIL FROM:<>
+250 OK
+RCPT TO:<r12@three.test.ex>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Server ready
+EHLO the.local.host.name
 250 OK
 MAIL FROM:<>
 250 OK