Fix ${domain:} for a bare local-part input. Bug 2375

[users/jgh/exim.git] / test / stdout / 4600

diff --git a/test/stdout/4600 b/test/stdout/4600
index c33a531c2ebf2f34c57b04eb457e590c778686fc..030d1ebd44b7759859c09c4a878cd6ba2c0f8ed6 100644 (file)
--- a/test/stdout/4600
+++ b/test/stdout/4600
@@ -1,15 +1,29 @@
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+Connecting to 127.0.0.1 port 1224 ... connected

 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> helo testclient
 ??? 250
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> helo testclient
 ??? 250

-<<< 250 myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
+<<< 250 myhost.test.ex Hello testclient [127.0.0.1]

 >>> mail from:<a@example.com>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<fred@test.ex>
 >>> mail from:<a@example.com>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<fred@test.ex>

-??? 550
-<<< 550 Administrative prohibition
+??? 250
+<<< 250 Accepted
+>>> quit
+End of script
+Connecting to ip4.ip4.ip4.ip4 port 1224 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo testclient
+??? 250
+<<< 250 myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
+>>> mail from:<b@test.example.com>
+??? 250
+<<< 250 OK
+>>> rcpt to:<fred@test.ex>
+??? 250
+<<< 250 Accepted

 >>> quit
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 >>> quit
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected


@@ -18,7 +32,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
 >>> helo testclient
 ??? 250
 <<< 250 myhost.test.ex Hello testclient [127.0.0.1]
 >>> helo testclient
 ??? 250
 <<< 250 myhost.test.ex Hello testclient [127.0.0.1]

->>> mail from:<b@example.com>
+>>> mail from:<c@example.com>

 ??? 250
 <<< 250 OK
 >>> rcpt to:<fred@test.ex>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<fred@test.ex>


@@ -26,3 +40,31 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 250 Accepted
 >>> quit
 End of script
 <<< 250 Accepted
 >>> quit
 End of script

+Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo testclient
+??? 250
+<<< 250 myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
+>>> mail from:<b@test.example.com>
+??? 250
+<<< 250 OK
+>>> rcpt to:<fred@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> quit
+End of script
+Connecting to 127.0.0.1 port 1223 ... connected
+??? 220
+<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> helo testclient
+??? 250
+<<< 250 myhost.test.ex Hello testclient [127.0.0.1]
+>>> mail from:<c@example.com>
+??? 250
+<<< 250 OK
+>>> rcpt to:<fred@test.ex>
+??? 550
+<<< 550 Administrative prohibition
+>>> quit
+End of script