Testsuite: handle RC tagging convention

[exim.git] / test / stderr / 3410

diff --git a/test/stderr/3410 b/test/stderr/3410
index e129996a7872c4973b5ba7743c0c8491c38c09af..80cf29925bc48d06b1c863edd2e6ea62555f8321 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -7,15 +7,17 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_5_6_9"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> 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
 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)
 >>>   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
 >>> 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 "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

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

 >>> auth1 authenticator server_condition:
 >>>   $auth1 = 
 >>>   $auth2 = userx
 >>> auth1 authenticator server_condition:
 >>>   $auth1 = 
 >>>   $auth2 = userx


@@ -25,11 +27,12 @@ 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 "*")
 >>> accept: condition test succeeded in ACL "acl_5_6_9"
 >>>   message: You must authenticate
 >>> check authenticated = *
 >>> auth1 in "*"? yes (matched "*")
 >>> 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)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -39,14 +42,16 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_5_6_10"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> 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
 LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> 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>
 >>> 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 "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

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

 >>> auth1 authenticator server_condition:
 >>>   $auth1 = 
 >>>   $auth2 = userx
 >>> auth1 authenticator server_condition:
 >>>   $auth1 = 
 >>>   $auth2 = userx


@@ -56,10 +61,11 @@ 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"

+>>> 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)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -69,8 +75,10 @@ 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 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 "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in auth_advertise_hosts? yes (matched "*")

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

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


@@ -78,7 +86,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"