X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6fc54bd18aa7a51e11dce5a905e754cedb526230..e0b3815dc398d7abaa1f81c9f26b1c9b050e94c0:/test/stderr/3500

diff --git a/test/stderr/3500 b/test/stderr/3500
index 50035a129..997fd6090 100644
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -6,32 +6,33 @@
 >>> 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.host in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host 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 auth_advertise_hosts?
 >>>  list element: +auth_hosts
->>>  host in "10.0.0.1 : 10.0.0.5"?
->>>   list element: 10.0.0.1
->>>   list element: 10.0.0.5
->>>  host in "10.0.0.1 : 10.0.0.5"? no (end of list)
+>>>   start sublist auth_hosts
+>>>    host in "10.0.0.1 : 10.0.0.5"?
+>>>    ╎list element: 10.0.0.1
+>>>    ╎list element: 10.0.0.5
+>>>    host in "10.0.0.1 : 10.0.0.5"? no (end of list)
+>>>   end sublist auth_hosts
 >>>  list element: !+relay_hosts
->>>  host in "10.0.0.4"?
->>>   list element: 10.0.0.4
->>>   host in "10.0.0.4"? yes (matched "10.0.0.4")
+>>>   start sublist relay_hosts
+>>>    host in "10.0.0.4"?
+>>>    ╎list element: 10.0.0.4
+>>>    ╎host in "10.0.0.4"? yes (matched "10.0.0.4")
+>>>   end sublist relay_hosts
 >>>  host in auth_advertise_hosts? no (matched "!+relay_hosts")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> host in tls_advertise_hosts?
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -40,27 +41,26 @@
 >>> 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.host in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host 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 auth_advertise_hosts?
 >>>  list element: +auth_hosts
->>>  host in "10.0.0.1 : 10.0.0.5"?
->>>   list element: 10.0.0.1
->>>   host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1")
+>>>   start sublist auth_hosts
+>>>    host in "10.0.0.1 : 10.0.0.5"?
+>>>    ╎list element: 10.0.0.1
+>>>    ╎host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1")
+>>>   end sublist auth_hosts
 >>>  host in auth_advertise_hosts? yes (matched "+auth_hosts")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> host in tls_advertise_hosts?
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
@@ -94,6 +94,9 @@
 >>> check hosts = +auth_hosts
 >>> host in "+auth_hosts"?
 >>>  list element: +auth_hosts
+>>>   start sublist auth_hosts
+>>>  cached yes match for +auth_hosts
+>>>  cached lookup data = NULL
 >>>  host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
 >>>   message: authentication required
 >>> check !authenticated = *
@@ -105,14 +108,17 @@
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
 >>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=cram_md5:tim S=sss
+LOG: 10HmaY-000000005vi-0000 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=cram_md5:tim S=sss
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -121,28 +127,27 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c
 >>> 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.host in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> test.host 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 auth_advertise_hosts?
 >>>  list element: +auth_hosts
->>>  host in "10.0.0.1 : 10.0.0.5"?
->>>   list element: 10.0.0.1
->>>   list element: 10.0.0.5
->>>   host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5")
+>>>   start sublist auth_hosts
+>>>    host in "10.0.0.1 : 10.0.0.5"?
+>>>    ╎list element: 10.0.0.1
+>>>    ╎list element: 10.0.0.5
+>>>    ╎host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5")
+>>>   end sublist auth_hosts
 >>>  host in auth_advertise_hosts? yes (matched "+auth_hosts")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> host in tls_advertise_hosts?
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
@@ -170,4 +175,4 @@ LOG: cram_md5 authenticator failed for (test.host) [10.0.0.5]: 535 Incorrect aut
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaZ-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.5] P=esmtp S=sss
+LOG: 10HmaZ-000000005vi-0000 <= userx@some.domain H=(test.host) [10.0.0.5] P=esmtp S=sss