Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stdout / 4601

diff --git a/test/stdout/4601 b/test/stdout/4601
index 9abbcf5a8ff9afc07f52e7b05354b50199b58f75..38eefab33fe7975ffd76aa2e9f92e274ef713a23 100644 (file)
--- a/test/stdout/4601
+++ b/test/stdout/4601
@@ -1,9 +1,9 @@
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
+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 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
 >>> mail from:<a@example.com>
 ??? 250
 <<< 250 OK


@@ -12,7 +12,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 <<< 250 Accepted
 >>> quit
 End of script
 <<< 250 Accepted
 >>> quit
 End of script

-Connecting to 127.0.0.1 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
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> helo testclient


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

+> eDNS_NOMATCH       none      none
+> eDNS_AGAIN         temperror temperror
+> multiple rr        permerror permerror
+> multi + non-spf    permerror permerror
+> uppercase in v=    pass      pass
+> only non-spf txt   none      none
+>