Bugtrack 1290 - Spec grammar fixes.

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

diff --git a/test/stderr/3410 b/test/stderr/3410
index 02dc1343cefb444cac899379874340a6c97fb525..6dcb2c5db12f4cf6743ffee0140f942071cb783c 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -9,13 +9,16 @@
 >>> using ACL "acl_5_6_9"
 >>> processing "accept"
 >>> check authenticated = *
 >>> using ACL "acl_5_6_9"
 >>> processing "accept"
 >>> 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 pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
 >>> 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 pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

->>> auth1 authenticator:
+>>> auth1 authenticator server_condition:
+>>>   $auth1 = 
+>>>   $auth2 = userx
+>>>   $auth3 = secret

 >>>   $1 = 
 >>>   $2 = userx
 >>>   $3 = secret
 >>>   $1 = 
 >>>   $2 = userx
 >>>   $3 = secret


@@ -24,7 +27,7 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>> processing "accept"
 >>> check authenticated = *
 >>> auth1 in "*"? yes (matched "*")
 >>> processing "accept"
 >>> check authenticated = *
 >>> auth1 in "*"? yes (matched "*")

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "acl_5_6_9"

 >>> 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)


@@ -36,13 +39,16 @@ 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
 >>> 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 pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
 >>> 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 pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

->>> auth1 authenticator:
+>>> auth1 authenticator server_condition:
+>>>   $auth1 = 
+>>>   $auth2 = userx
+>>>   $auth3 = secret

 >>>   $1 = 
 >>>   $2 = userx
 >>>   $3 = secret
 >>>   $1 = 
 >>>   $2 = userx
 >>>   $3 = secret


@@ -51,7 +57,7 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> processing "accept"
 >>> check authenticated = auth1
 >>> auth1 in "auth1"? yes (matched "auth1")
 >>> 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"

 >>> 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)


@@ -63,7 +69,9 @@ 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 pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

->>> auth2 authenticator:
+>>> auth2 authenticator server_condition:
+>>>   $auth1 = userx
+>>>   $auth2 = secret

 >>>   $1 = userx
 >>>   $2 = secret
 >>> expanded string: yes
 >>>   $1 = userx
 >>>   $2 = secret
 >>> expanded string: yes


@@ -71,6 +79,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)
 >>> 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
 >>> 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>