Restore expansion of "inlist" RHS

[exim.git] / test / stderr / 0524

diff --git a/test/stderr/0524 b/test/stderr/0524
index f515c0622122a59c69ddf6f1cacadb4a9f78f501..07e32fee955f806975bda71d46c198757a993b74 100644 (file)
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -10,6 +10,8 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *


@@ -17,11 +19,11 @@
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_mail"
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_mail"

->>> processing "accept" (TESTSUITE/test-config 18)
+>>> processing ACL check_mail "accept" (TESTSUITE/test-config 18)

 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>>   message: CSA status is $csa_status
 >>> check verify = csa

->>> accept: condition test succeeded in ACL "check_mail"
->>> end of ACL "check_mail": ACCEPT
+>>> accept: condition test succeeded in ACL check_mail
+>>> end of ACL check_mail: ACCEPT

 >>> host in smtp_accept_max_nonmail_hosts?
 >>>  list element: *
 >>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> host in smtp_accept_max_nonmail_hosts?
 >>>  list element: *
 >>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")


@@ -29,6 +31,8 @@
 >>>  list element: @
 >>>  list element: @[]
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *


@@ -36,10 +40,10 @@
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_mail"
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_mail"

->>> processing "accept" (TESTSUITE/test-config 18)
+>>> processing ACL check_mail "accept" (TESTSUITE/test-config 18)

 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>>   message: CSA status is $csa_status
 >>> check verify = csa

->>> accept: condition test failed in ACL "check_mail"
+>>> accept: condition test failed in ACL check_mail

 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> host in hosts_connection_nolog? no (option unset)


@@ -54,6 +58,8 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>>  list element: @
 >>>  list element: @[]
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *


@@ -61,10 +67,10 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_mail"
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_mail"

->>> processing "accept" (TESTSUITE/test-config 18)
+>>> processing ACL check_mail "accept" (TESTSUITE/test-config 18)

 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>>   message: CSA status is $csa_status
 >>> check verify = csa

->>> accept: condition test failed in ACL "check_mail"
+>>> accept: condition test failed in ACL check_mail

 >>> accept: endpass encountered - denying access
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
 >>> host in smtp_accept_max_nonmail_hosts?
 >>> accept: endpass encountered - denying access
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
 >>> host in smtp_accept_max_nonmail_hosts?


@@ -74,6 +80,8 @@ LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization
 >>>  list element: @
 >>>  list element: @[]
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *


@@ -81,9 +89,9 @@ LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_mail"
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_mail"

->>> processing "accept" (TESTSUITE/test-config 18)
+>>> processing ACL check_mail "accept" (TESTSUITE/test-config 18)

 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>>   message: CSA status is $csa_status
 >>> check verify = csa

->>> accept: condition test failed in ACL "check_mail"
+>>> accept: condition test failed in ACL check_mail

 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (host name not authorized)
 >>> accept: endpass encountered - denying access
 LOG: H=(csa2.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (host name not authorized)