Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stdout / 0618

diff --git a/test/stdout/0618 b/test/stdout/0618
index a04553a0b375105b8dbaac3c7ca3b8fed23c741d..6bb2ca97f7d189b3f4a42d4ef6e09daa5b5a2f13 100644 (file)
--- a/test/stdout/0618
+++ b/test/stdout/0618
@@ -94,7 +94,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 >>> Subject: test
 >>> .
 ??? 250
-<<< 250 OK id=10HmbA-0005vi-00
+<<< 250 OK id=10HmbB-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
@@ -123,7 +123,38 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 >>> Subject: test
 >>> .
 ??? 250
-<<< 250 OK id=10HmbB-0005vi-00
+<<< 250 OK id=10HmbC-0005vi-00
+>>> QUIT
+??? 221
+<<< 221 myhost.test.ex closing connection
+End of script
+Message 10HmbB-0005vi-00 has been removed
+Message 10HmbC-0005vi-00 has been removed
+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
+>>> EHLO testclient
+??? 250-
+<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
+??? 250-SIZE
+<<< 250-SIZE 52428800
+??? 250-DSN
+<<< 250-DSN
+??? 250 HELP
+<<< 250 HELP
+>>> MAIL FROM:<e@dump.ex>
+??? 250
+<<< 250 OK
+>>> RCPT TO:<rmt_reject@test.ex> NOTIFY=fAiLuRe,DELAY
+??? 250
+<<< 250 Accepted
+>>> DATA
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> Subject: test
+>>> .
+??? 250
+<<< 250 OK id=10HmbE-0005vi-00
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection