Testtsuite: output changes resulting

[users/jgh/exim.git] / test / stderr / 3410

diff --git a/test/stderr/3410 b/test/stderr/3410
index 02dc1343cefb444cac899379874340a6c97fb525..36fbdb42561d59ade878d73dff918f42d049aa6c 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -8,23 +8,31 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_5_6_9"
 >>> processing "accept"
+>>>   message: You must authenticate
 >>> check authenticated = *
->>> accept: condition test failed
+>>> 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
 >>> 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 "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
->>> auth1 authenticator:
+>>> host in chunking_advertise_hosts? no (end of list)
+>>> auth1 authenticator server_condition:
+>>>   $auth1 = 
+>>>   $auth2 = userx
+>>>   $auth3 = secret
 >>>   $1 = 
 >>>   $2 = userx
 >>>   $3 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_9"
 >>> processing "accept"
+>>>   message: You must authenticate
 >>> check authenticated = *
 >>> auth1 in "*"? yes (matched "*")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "acl_5_6_9"
+>>> end of ACL "acl_5_6_9": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -36,13 +44,18 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>> using ACL "acl_5_6_10"
 >>> processing "accept"
 >>> check authenticated = auth1
->>> accept: condition test failed
+>>> 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>
 >>> 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 "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
->>> auth1 authenticator:
+>>> host in chunking_advertise_hosts? no (end of list)
+>>> auth1 authenticator server_condition:
+>>>   $auth1 = 
+>>>   $auth2 = userx
+>>>   $auth3 = secret
 >>>   $1 = 
 >>>   $2 = userx
 >>>   $3 = secret
@@ -51,7 +64,8 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> processing "accept"
 >>> check authenticated = auth1
 >>> auth1 in "auth1"? yes (matched "auth1")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "acl_5_6_10"
+>>> end of ACL "acl_5_6_10": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -61,9 +75,13 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> 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 "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
->>> auth2 authenticator:
+>>> host in chunking_advertise_hosts? no (end of list)
+>>> auth2 authenticator server_condition:
+>>>   $auth1 = userx
+>>>   $auth2 = secret
 >>>   $1 = userx
 >>>   $2 = secret
 >>> expanded string: yes
@@ -71,6 +89,6 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> processing "accept"
 >>> check authenticated = auth1
 >>> auth2 in "auth1"? no (end of list)
->>> accept: condition test failed
+>>> accept: condition test failed in ACL "acl_5_6_10"
 >>> end of ACL "acl_5_6_10": implicit DENY
-LOG: H=(rhu.barb) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
+LOG: H=(rhu.barb) [5.6.10.1] F=<x@y> A=auth2 rejected RCPT <x@y>