Retry: always use interface, if set, for retry DB key. Bug 1678

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

diff --git a/test/stdout/0568 b/test/stdout/0568
index 671998a86b5e4ded1da91a205741aec14deefd0b..2db3157dd59af1aba03295abae394141a5ce049c 100644 (file)
--- a/test/stdout/0568
+++ b/test/stdout/0568
@@ -1,82 +1,24 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-myhost.test.ex Hello CALLER at the.client\r
+250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-AUTH PLAIN\r
 250 HELP\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
 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 the.client\r
+250-myhost.test.ex Hello CALLER at test.ex\r
 250-SIZE 52428800\r
 250-8BITMIME\r
 250-PIPELINING\r
-250-AUTH PLAIN\r
 250 HELP\r
-235 Authentication succeeded\r
 250 OK\r
 250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+550-Your message has been rejected but is being kept for evaluation.\r
+550-If it was a legitimate message, it may still be delivered to the target\r
+550 recipient(s).\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 the.client\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-AUTH PLAIN\r
-250 HELP\r
-235 Authentication succeeded\r
-250 OK\r
-250 Accepted\r
-221 myhost.test.ex closing connection\r
-
-******** SERVER ********
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Welcome
-EHLO myhost.test.ex
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-250 Oh alright then
-MAIL FROM:<> AUTH=brian
-250 OK
-RCPT TO:<abc@force>
-250 OK
-QUIT
-250 OK
-End of script
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Welcome
-EHLO myhost.test.ex
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-250 Oh alright then
-MAIL FROM:<> AUTH=freddy
-250 OK
-RCPT TO:<abc@normal>
-250 OK
-QUIT
-250 OK
-End of script
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Welcome
-EHLO myhost.test.ex
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-250 Oh alright then
-MAIL FROM:<> AUTH=brian
-250 OK
-RCPT TO:<def@force>
-250 OK
-QUIT
-250 OK
-End of script