Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stderr / 3500

diff --git a/test/stderr/3500 b/test/stderr/3500
index 61225ae7dbf5d2f8bb5615863c4ce161fe291487..fc337eef07d42755a2bad0c9df6e9a1ea93a91ce 100644 (file)
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -12,6 +12,7 @@
 >>> host in "10.0.0.1 : 10.0.0.5"? no (end of list)
 >>> host in "10.0.0.4"? yes (matched "10.0.0.4")
 >>> host in auth_advertise_hosts? no (matched "!+relay_hosts")
 >>> host in "10.0.0.1 : 10.0.0.5"? no (end of list)
 >>> host in "10.0.0.4"? yes (matched "10.0.0.4")
 >>> host in auth_advertise_hosts? no (matched "!+relay_hosts")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -25,6 +26,7 @@
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1")
 >>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1")
 >>> host in auth_advertise_hosts? yes (matched "+auth_hosts")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>


@@ -36,26 +38,26 @@
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> expanded string: true
 >>> using ACL "check_recipient"
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> expanded string: true
 >>> using ACL "check_recipient"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)
 >>> warn: condition test failed in ACL "check_recipient"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)
 >>> warn: condition test failed in ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 33)

 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 34)

 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 35)

 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>>   message: authentication required
 >>> check !authenticated = *
 >>> cram_md5 in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>>   message: authentication required
 >>> check !authenticated = *
 >>> cram_md5 in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 38)

 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")


@@ -76,6 +78,7 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5")
 >>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5")
 >>> host in auth_advertise_hosts? yes (matched "+auth_hosts")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>


@@ -88,12 +91,12 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c
 >>> expanded string: 
 LOG: cram_md5 authenticator failed for (test.host) [10.0.0.5]: 535 Incorrect authentication data (set_id=tim)
 >>> using ACL "check_recipient"
 >>> expanded string: 
 LOG: cram_md5 authenticator failed for (test.host) [10.0.0.5]: 535 Incorrect authentication data (set_id=tim)
 >>> using ACL "check_recipient"

->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? yes (matched "10.0.0.5")
 >>>   message: authentication-failed: $authentication_failed
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? yes (matched "10.0.0.5")
 >>>   message: authentication-failed: $authentication_failed
 >>> warn: condition test succeeded in ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 33)

 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? yes (matched "10.0.0.5")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> check hosts = 10.0.0.5
 >>> host in "10.0.0.5"? yes (matched "10.0.0.5")
 >>> accept: condition test succeeded in ACL "check_recipient"