Hintsbd: fix locking

[exim.git] / test / stderr / 0070

diff --git a/test/stderr/0070 b/test/stderr/0070
index f40155a67170c7baed85620744eaf47248abdaf2..18fe9e93e1bace629f2e99bd18835543dfd92957 100644 (file)
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -10,8 +10,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
 >>>  host in helo_verify_hosts? yes (matched "ten-1.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 LOG: rejected MAIL from [V4NET.0.0.1]: no HELO/EHLO given
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -35,8 +33,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> host in hosts_require_helo?
 >>> host in hosts_require_helo? no (end of list)
 >>> using ACL "rcpt"
@@ -70,8 +66,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>>  host in helo_try_verify_hosts? yes (matched "ten-2.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> [V4NET.0.0.1] in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -107,8 +101,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>>  host in helo_try_verify_hosts? yes (matched "ten-2.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> [V4NET.0.0.2] in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -137,8 +129,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
 >>>  host in helo_verify_hosts? yes (matched "ten-1.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> ten-1.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -146,6 +136,10 @@ MUNGED: ::1 will be omitted in what follows
 >>> verifying EHLO/HELO argument "ten-1.test.ex"
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
+>>>  check dnssec require list
+>>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> matched host name
@@ -165,8 +159,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-3.test.ex address=V4NET.0.0.3
 >>>  host in helo_verify_hosts? yes (matched "ten-3.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> ten-3.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -175,8 +167,16 @@ MUNGED: ::1 will be omitted in what follows
 >>> looking up host name for V4NET.0.0.3
 >>> IP address lookup yielded "ten-3.test.ex"
 >>>   alias "ten-3-alias.test.ex"
+>>>  check dnssec require list
+>>>   ten-3.test.ex not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   ten-3.test.ex not in empty list (option unset? cannot trace name)
 >>> checking addresses for ten-3.test.ex
 >>>   V4NET.0.0.3 OK
+>>>  check dnssec require list
+>>>   ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   ten-3-alias.test.ex not in empty list (option unset? cannot trace name)
 >>> checking addresses for ten-3-alias.test.ex
 >>>   V4NET.0.0.3 OK
 >>> matched host name
@@ -187,11 +187,13 @@ MUNGED: ::1 will be omitted in what follows
 >>> matched alias ten-3-alias.test.ex
 >>> verifying EHLO/HELO argument "ten-3xtra.test.ex"
 >>> getting IP address for ten-3xtra.test.ex
->>> ten-3xtra.test.ex in ""?
->>> ten-3xtra.test.ex in ""? no (end of list)
->>> ten-3xtra.test.ex in "*"?
->>>  list element: *
->>>  ten-3xtra.test.ex in "*"? yes (matched "*")
+>>> check dnssec require list
+>>>  ten-3xtra.test.ex in ""?
+>>>  ten-3xtra.test.ex in ""? no (end of list)
+>>> check dnssec request list
+>>>  ten-3xtra.test.ex in "*"?
+>>>   list element: *
+>>>   ten-3xtra.test.ex in "*"? yes (matched "*")
 >>> IP address for ten-3xtra.test.ex matches calling address
 >>> Forward DNS security status: unverified
 >>> host in hosts_connection_nolog? no (option unset)
@@ -206,8 +208,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-1.test.ex address=V4NET.0.0.1
 >>>  host in helo_verify_hosts? yes (matched "ten-1.test.ex")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> rhubarb in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -215,14 +215,20 @@ MUNGED: ::1 will be omitted in what follows
 >>> verifying EHLO/HELO argument "rhubarb"
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
+>>>  check dnssec require list
+>>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   ten-1.test.ex not in empty list (option unset? cannot trace name)
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> getting IP address for rhubarb
->>> rhubarb in ""?
->>> rhubarb in ""? no (end of list)
->>> rhubarb in "*"?
->>>  list element: *
->>>  rhubarb in "*"? yes (matched "*")
+>>> check dnssec require list
+>>>  rhubarb in ""?
+>>>  rhubarb in ""? no (end of list)
+>>> check dnssec request list
+>>>  rhubarb in "*"?
+>>>   list element: *
+>>>   rhubarb in "*"? yes (matched "*")
 LOG: rejected "EHLO rhubarb" from (rhubarb) [V4NET.0.0.1]
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -241,8 +247,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>  list element: 99.99.99.99
 >>>  host in helo_verify_hosts? yes (matched "99.99.99.99")
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> rhubarb in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -251,11 +255,13 @@ MUNGED: ::1 will be omitted in what follows
 >>> looking up host name for 99.99.99.99
 >>> Test harness: host name lookup returns DEFER
 >>> getting IP address for rhubarb
->>> rhubarb in ""?
->>> rhubarb in ""? no (end of list)
->>> rhubarb in "*"?
->>>  list element: *
->>>  rhubarb in "*"? yes (matched "*")
+>>> check dnssec require list
+>>>  rhubarb in ""?
+>>>  rhubarb in ""? no (end of list)
+>>> check dnssec request list
+>>>  rhubarb in "*"?
+>>>   list element: *
+>>>   rhubarb in "*"? yes (matched "*")
 LOG: temporarily rejected "EHLO rhubarb" from (rhubarb) [99.99.99.99]
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -279,8 +285,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> [V4NET.0.0.99] in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -315,8 +319,6 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> [V4NET.0.0.13] in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -355,21 +357,18 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> rhubarb in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> rhubarb 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 pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> host in tls_advertise_hosts?
 >>> using ACL "rcpt"
 >>> processing "require" (TESTSUITE/test-config 23)
 >>>   message: helo not verified
@@ -378,11 +377,13 @@ MUNGED: ::1 will be omitted in what follows
 >>> looking up host name for 99.99.99.99
 >>> Test harness: host name lookup returns DEFER
 >>> getting IP address for rhubarb
->>> rhubarb in ""?
->>> rhubarb in ""? no (end of list)
->>> rhubarb in "*"?
->>>  list element: *
->>>  rhubarb in "*"? yes (matched "*")
+>>> check dnssec require list
+>>>  rhubarb in ""?
+>>>  rhubarb in ""? no (end of list)
+>>> check dnssec request list
+>>>  rhubarb in "*"?
+>>>   list element: *
+>>>   rhubarb in "*"? yes (matched "*")
 >>> require: condition test failed in ACL "rcpt"
 >>> end of ACL "rcpt": not OK
 LOG: H=(rhubarb) [99.99.99.99] F=<a@b> rejected RCPT <c@d>: helo not verified