X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/897024f1b30dfde19f8ed9477c49b7cd5a1f5512..e3c771232d4f02c907c5ac7bb037c67a7dd63c8b:/test/stderr/3500?ds=sidebyside

diff --git a/test/stderr/3500 b/test/stderr/3500
index fc337eef0..997fd6090 100644
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -6,12 +6,32 @@
 >>> 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)
+>>> test.host in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test.host 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? yes (matched "*")
->>> host in "10.0.0.1 : 10.0.0.5"? no (end of list)
->>> host in "10.0.0.4"? yes (matched "10.0.0.4")
->>> host in auth_advertise_hosts? no (matched "!+relay_hosts")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in auth_advertise_hosts?
+>>>  list element: +auth_hosts
+>>>   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
+>>>   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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -21,11 +41,25 @@
 >>> 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)
+>>> test.host in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test.host 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? yes (matched "*")
->>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1")
->>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in auth_advertise_hosts?
+>>>  list element: +auth_hosts
+>>>   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)
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
@@ -40,31 +74,51 @@
 >>> using ACL "check_recipient"
 >>> processing "warn" (TESTSUITE/test-config 31)
 >>> check hosts = 10.0.0.5
+>>> host in "10.0.0.5"?
+>>>  list element: 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)
 >>> warn: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 33)
 >>> check hosts = 10.0.0.5
+>>> host in "10.0.0.5"?
+>>>  list element: 10.0.0.5
 >>> host in "10.0.0.5"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 34)
 >>> check hosts = :
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 35)
 >>> check hosts = +auth_hosts
->>> host in "+auth_hosts"? yes (matched "+auth_hosts" - cached)
+>>> 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 = *
->>> cram_md5 in "*"? yes (matched "*")
+>>> cram_md5 in "*"?
+>>>  list element: *
+>>>  cram_md5 in "*"? yes (matched "*")
 >>> deny: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 38)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>   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)
@@ -73,11 +127,26 @@ 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)
+>>> test.host in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test.host 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? yes (matched "*")
->>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5")
->>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in auth_advertise_hosts?
+>>>  list element: +auth_hosts
+>>>   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)
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
@@ -93,13 +162,17 @@ LOG: cram_md5 authenticator failed for (test.host) [10.0.0.5]: 535 Incorrect aut
 >>> using ACL "check_recipient"
 >>> processing "warn" (TESTSUITE/test-config 31)
 >>> check hosts = 10.0.0.5
->>> host in "10.0.0.5"? yes (matched "10.0.0.5")
+>>> host in "10.0.0.5"?
+>>>  list element: 10.0.0.5
+>>>  host in "10.0.0.5"? yes (matched "10.0.0.5")
 >>>   message: authentication-failed: $authentication_failed
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 33)
 >>> check hosts = 10.0.0.5
->>> host in "10.0.0.5"? yes (matched "10.0.0.5")
+>>> host in "10.0.0.5"?
+>>>  list element: 10.0.0.5
+>>>  host in "10.0.0.5"? yes (matched "10.0.0.5")
 >>> 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