Fix multi-method query-style lookup quoters

[exim.git] / test / stderr / 3410

diff --git a/test/stderr/3410 b/test/stderr/3410
index 47b30a628ed9908b670b6fa2c81388a0335eb80b..926b7dd19632cff608d73b0910ad34244283985e 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -6,8 +6,6 @@
 >>> 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)

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]


@@ -26,8 +24,8 @@ LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)

->>> host in limits_advertise_hosts?
->>>  list element: !*
+>>>  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: *


@@ -37,7 +35,6 @@ LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>>  host in auth_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>>  host in auth_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)

->>> host in tls_advertise_hosts?

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


@@ -63,8 +60,6 @@ LOG: H=(test) [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)

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]


@@ -82,8 +77,8 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)

->>> host in limits_advertise_hosts?
->>>  list element: !*
+>>>  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: *


@@ -93,7 +88,6 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>  host in auth_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>>  host in auth_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)

->>> host in tls_advertise_hosts?

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


@@ -118,14 +112,12 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> 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)

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> rhu.barb in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> rhu.barb in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)

->>> host in limits_advertise_hosts?
->>>  list element: !*
+>>>  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: *


@@ -135,7 +127,6 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>  host in auth_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>>  host in auth_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)

->>> host in tls_advertise_hosts?

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