Variable setting in -be

[exim.git] / test / stderr / 3410

diff --git a/test/stderr/3410 b/test/stderr/3410
index 36fbdb42561d59ade878d73dff918f42d049aa6c..a8470e93cf22433eeee6eaebe1e8e8d360d1a5d6 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -6,13 +6,15 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_9"
 >>> using ACL "acl_5_6_9"

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

 >>>   message: You must authenticate
 >>> check authenticated = *
 >>> accept: condition test failed in ACL "acl_5_6_9"
 >>> accept: endpass encountered - denying access
 >>>   message: You must authenticate
 >>> check authenticated = *
 >>> accept: condition test failed in ACL "acl_5_6_9"
 >>> accept: endpass encountered - denying access

-LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
+LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
+>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")

 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")


@@ -27,7 +29,7 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>>   $3 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_9"
 >>>   $3 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_9"

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

 >>>   message: You must authenticate
 >>> check authenticated = *
 >>> auth1 in "*"? yes (matched "*")
 >>>   message: You must authenticate
 >>> check authenticated = *
 >>> auth1 in "*"? yes (matched "*")


@@ -41,12 +43,14 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_10"
 >>> using ACL "acl_5_6_10"

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

 >>> check authenticated = auth1
 >>> accept: condition test failed in ACL "acl_5_6_10"
 >>> end of ACL "acl_5_6_10": implicit DENY
 >>> check authenticated = auth1
 >>> accept: condition test failed in ACL "acl_5_6_10"
 >>> end of ACL "acl_5_6_10": implicit DENY

-LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
+>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")

 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")


@@ -61,7 +65,7 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>   $3 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_10"
 >>>   $3 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_10"

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

 >>> check authenticated = auth1
 >>> auth1 in "auth1"? yes (matched "auth1")
 >>> accept: condition test succeeded in ACL "acl_5_6_10"
 >>> check authenticated = auth1
 >>> auth1 in "auth1"? yes (matched "auth1")
 >>> accept: condition test succeeded in ACL "acl_5_6_10"


@@ -86,7 +90,7 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>   $2 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_10"
 >>>   $2 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_10"

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

 >>> check authenticated = auth1
 >>> auth2 in "auth1"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_10"
 >>> check authenticated = auth1
 >>> auth2 in "auth1"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_10"