Debug: list searching

1 files changed, 194 insertions, 41 deletions

diff --git a/test/stderr/0021 b/test/stderr/0021
index c330bc449..18ed27f0c 100644
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -1,4 +1,29 @@
 Exim version x.yz ....
+SHELL in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+EXIM_TEST_NUMBER in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+PWD in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+TERM in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+USER in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+SHLVL in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+PATH in keep_environment?
+ list element: PATH
+_ in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+PATH in keep_environment?
+ list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -15,11 +40,16 @@ host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"
 processing "deny" (TESTSUITE/test-config 52)
 check hosts = : 10.9.8.7
+host in ": 10.9.8.7"?
+ list element: 
+ list element: 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"
 processing "drop" (TESTSUITE/test-config 53)
 l_message: forcibly dropped
 check hosts = 10.9.8.9
+host in "10.9.8.9"?
+ list element: 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"
 processing "accept" (TESTSUITE/test-config 55)
@@ -29,38 +59,59 @@ LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
+host in pipelining_connect_advertise_hosts?
+ list element: 
+host in hosts_require_helo?
+ list element: 
 host in hosts_require_helo? no (end of list)
 using ACL "mail"
 processing "warn" (TESTSUITE/test-config 63)
   message: added header line
 check senders = ok@test3
-address match test: subject=bad@test1 pattern=ok@test3
+bad@test1 in "ok@test3"?
+ list element: ok@test3
+ address match test: subject=bad@test1 pattern=ok@test3
 bad@test1 in "ok@test3"? no (end of list)
 warn: condition test failed in ACL "mail"
 processing "accept" (TESTSUITE/test-config 65)
 check senders = ok@test1 : ok@test3
-address match test: subject=bad@test1 pattern=ok@test1
-address match test: subject=bad@test1 pattern=ok@test3
+bad@test1 in "ok@test1 : ok@test3"?
+ list element: ok@test1
+ address match test: subject=bad@test1 pattern=ok@test1
+ list element: ok@test3
+ address match test: subject=bad@test1 pattern=ok@test3
 bad@test1 in "ok@test1 : ok@test3"? no (end of list)
 accept: condition test failed in ACL "mail"
 end of ACL "mail": implicit DENY
 LOG: MAIN REJECT
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
+host in hosts_require_helo?
+ list element: 
 host in hosts_require_helo? no (end of list)
 using ACL "mail"
 processing "warn" (TESTSUITE/test-config 63)
   message: added header line
 check senders = ok@test3
-address match test: subject=ok@test1 pattern=ok@test3
-test1 in "test3"? no (end of list)
+ok@test1 in "ok@test3"?
+ list element: ok@test3
+ address match test: subject=ok@test1 pattern=ok@test3
+ test1 in "test3"?
+  list element: test3
+ test1 in "test3"? no (end of list)
 ok@test1 in "ok@test3"? no (end of list)
 warn: condition test failed in ACL "mail"
 processing "accept" (TESTSUITE/test-config 65)
 check senders = ok@test1 : ok@test3
-address match test: subject=ok@test1 pattern=ok@test1
-test1 in "test1"? yes (matched "test1")
-ok@test1 in "ok@test1 : ok@test3"? yes (matched "ok@test1")
+ok@test1 in "ok@test1 : ok@test3"?
+ list element: ok@test1
+ address match test: subject=ok@test1 pattern=ok@test1
+ test1 in "test1"?
+  list element: test1
+  test1 in "test1"? yes (matched "test1")
+ ok@test1 in "ok@test1 : ok@test3"? yes (matched "ok@test1")
 check verify = sender
+ok in "!bad"?
+ list element: !bad
 ok in "!bad"? yes (end of list)
 ----------- end verify ------------
 sender ok@test1 verified ok
@@ -73,16 +124,34 @@ end of ACL "mail": ACCEPT
 using ACL "rcpt"
 processing "accept" (TESTSUITE/test-config 70)
 check senders = +ok_senders
-address match test: subject=ok@test1 pattern=ok@somewhere
-test1 in "somewhere"? no (end of list)
-address match test: subject=ok@test1 pattern=ok@test1
-test1 in "test1"? yes (matched "test1")
-ok@test1 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test1")
-data from lookup saved for cache for +ok_senders: key 'ok@test1' value 'ok@test1'
-ok@test1 in "+ok_senders"? yes (matched "+ok_senders")
+ok@test1 in "+ok_senders"?
+ list element: +ok_senders
+  start sublist ok_senders
+   ok@test1 in "ok@somewhere : ok@test1 : ok@test3"?
+   ╎list element: ok@somewhere
+   ╎address match test: subject=ok@test1 pattern=ok@somewhere
+   ╎test1 in "somewhere"?
+   ╎ list element: somewhere
+   ╎test1 in "somewhere"? no (end of list)
+   ╎list element: ok@test1
+   ╎address match test: subject=ok@test1 pattern=ok@test1
+   ╎test1 in "test1"?
+   ╎ list element: test1
+   ╎ test1 in "test1"? yes (matched "test1")
+   ╎ok@test1 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test1")
+  end sublist ok_senders
+ data from lookup saved for cache for +ok_senders: key 'ok@test1' value 'ok@test1'
+ ok@test1 in "+ok_senders"? yes (matched "+ok_senders")
 check sender_domains = +ok_sender_domains
-test1 in "somewhere : test1 : test3"? yes (matched "test1")
-test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
+test1 in "+ok_sender_domains"?
+ list element: +ok_sender_domains
+  start sublist ok_sender_domains
+   test1 in "somewhere : test1 : test3"?
+   ╎list element: somewhere
+   ╎list element: test1
+   ╎test1 in "somewhere : test1 : test3"? yes (matched "test1")
+  end sublist ok_sender_domains
+ test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
 check logwrite = :panic: rcpt accepted C=$smtp_command_history
                = :panic: rcpt accepted C=MAIL,MAIL,RCPT
 LOG: PANIC
@@ -92,12 +161,18 @@ end of ACL "rcpt": ACCEPT
 using ACL "rcpt"
 processing "accept" (TESTSUITE/test-config 70)
 check senders = +ok_senders
-cached yes match for +ok_senders
-cached lookup data = ok@test1
-ok@test1 in "+ok_senders"? yes (matched "+ok_senders" - cached)
+ok@test1 in "+ok_senders"?
+ list element: +ok_senders
+  start sublist ok_senders
+ cached yes match for +ok_senders
+ cached lookup data = ok@test1
+ ok@test1 in "+ok_senders"? yes (matched "+ok_senders" - cached)
 check sender_domains = +ok_sender_domains
-cached yes match for +ok_sender_domains
-test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains" - cached)
+test1 in "+ok_sender_domains"?
+ list element: +ok_sender_domains
+  start sublist ok_sender_domains
+ cached yes match for +ok_sender_domains
+ test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains" - cached)
 check logwrite = :panic: rcpt accepted C=$smtp_command_history
                = :panic: rcpt accepted C=MAIL,MAIL,RCPT,RCPT
 LOG: PANIC
@@ -109,6 +184,31 @@ LOG: smtp_connection MAIN
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 Exim version x.yz ....
+SHELL in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+EXIM_TEST_NUMBER in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+PWD in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+TERM in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+USER in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+SHLVL in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+PATH in keep_environment?
+ list element: PATH
+_ in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+PATH in keep_environment?
+ list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -125,11 +225,16 @@ host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"
 processing "deny" (TESTSUITE/test-config 52)
 check hosts = : 10.9.8.7
+host in ": 10.9.8.7"?
+ list element: 
+ list element: 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"
 processing "drop" (TESTSUITE/test-config 53)
 l_message: forcibly dropped
 check hosts = 10.9.8.9
+host in "10.9.8.9"?
+ list element: 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"
 processing "accept" (TESTSUITE/test-config 55)
@@ -139,23 +244,40 @@ LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
+host in pipelining_connect_advertise_hosts?
+ list element: 
+host in hosts_require_helo?
+ list element: 
 host in hosts_require_helo? no (end of list)
 using ACL "mail"
 processing "warn" (TESTSUITE/test-config 63)
   message: added header line
 check senders = ok@test3
-address match test: subject=ok@test3 pattern=ok@test3
-test3 in "test3"? yes (matched "test3")
-ok@test3 in "ok@test3"? yes (matched "ok@test3")
+ok@test3 in "ok@test3"?
+ list element: ok@test3
+ address match test: subject=ok@test3 pattern=ok@test3
+ test3 in "test3"?
+  list element: test3
+  test3 in "test3"? yes (matched "test3")
+ ok@test3 in "ok@test3"? yes (matched "ok@test3")
 warn: condition test succeeded in ACL "mail"
 processing "accept" (TESTSUITE/test-config 65)
 check senders = ok@test1 : ok@test3
-address match test: subject=ok@test3 pattern=ok@test1
-test3 in "test1"? no (end of list)
-address match test: subject=ok@test3 pattern=ok@test3
-test3 in "test3"? yes (matched "test3")
-ok@test3 in "ok@test1 : ok@test3"? yes (matched "ok@test3")
+ok@test3 in "ok@test1 : ok@test3"?
+ list element: ok@test1
+ address match test: subject=ok@test3 pattern=ok@test1
+ test3 in "test1"?
+  list element: test1
+ test3 in "test1"? no (end of list)
+ list element: ok@test3
+ address match test: subject=ok@test3 pattern=ok@test3
+ test3 in "test3"?
+  list element: test3
+  test3 in "test3"? yes (matched "test3")
+ ok@test3 in "ok@test1 : ok@test3"? yes (matched "ok@test3")
 check verify = sender
+ok in "!bad"?
+ list element: !bad
 ok in "!bad"? yes (end of list)
 ----------- end verify ------------
 sender ok@test3 verified ok
@@ -168,18 +290,40 @@ end of ACL "mail": ACCEPT
 using ACL "rcpt"
 processing "accept" (TESTSUITE/test-config 70)
 check senders = +ok_senders
-address match test: subject=ok@test3 pattern=ok@somewhere
-test3 in "somewhere"? no (end of list)
-address match test: subject=ok@test3 pattern=ok@test1
-test3 in "test1"? no (end of list)
-address match test: subject=ok@test3 pattern=ok@test3
-test3 in "test3"? yes (matched "test3")
-ok@test3 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test3")
-data from lookup saved for cache for +ok_senders: key 'ok@test3' value 'ok@test3'
-ok@test3 in "+ok_senders"? yes (matched "+ok_senders")
+ok@test3 in "+ok_senders"?
+ list element: +ok_senders
+  start sublist ok_senders
+   ok@test3 in "ok@somewhere : ok@test1 : ok@test3"?
+   ╎list element: ok@somewhere
+   ╎address match test: subject=ok@test3 pattern=ok@somewhere
+   ╎test3 in "somewhere"?
+   ╎ list element: somewhere
+   ╎test3 in "somewhere"? no (end of list)
+   ╎list element: ok@test1
+   ╎address match test: subject=ok@test3 pattern=ok@test1
+   ╎test3 in "test1"?
+   ╎ list element: test1
+   ╎test3 in "test1"? no (end of list)
+   ╎list element: ok@test3
+   ╎address match test: subject=ok@test3 pattern=ok@test3
+   ╎test3 in "test3"?
+   ╎ list element: test3
+   ╎ test3 in "test3"? yes (matched "test3")
+   ╎ok@test3 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test3")
+  end sublist ok_senders
+ data from lookup saved for cache for +ok_senders: key 'ok@test3' value 'ok@test3'
+ ok@test3 in "+ok_senders"? yes (matched "+ok_senders")
 check sender_domains = +ok_sender_domains
-test3 in "somewhere : test1 : test3"? yes (matched "test3")
-test3 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
+test3 in "+ok_sender_domains"?
+ list element: +ok_sender_domains
+  start sublist ok_sender_domains
+   test3 in "somewhere : test1 : test3"?
+   ╎list element: somewhere
+   ╎list element: test1
+   ╎list element: test3
+   ╎test3 in "somewhere : test1 : test3"? yes (matched "test3")
+  end sublist ok_sender_domains
+ test3 in "+ok_sender_domains"? yes (matched "+ok_sender_domains")
 check logwrite = :panic: rcpt accepted C=$smtp_command_history
                = :panic: rcpt accepted C=MAIL,RCPT
 LOG: PANIC
@@ -192,10 +336,19 @@ end of ACL "rcpt": ACCEPT
 LOG: MAIN
   <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
 Exim version x.yz ....
+PATH in keep_environment?
+ list element: PATH
+SSLKEYLOGFILE in keep_environment?
+ list element: PATH
+ list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+PATH in keep_environment?
+ list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
+x in "!bad"?
+ list element: !bad
 x in "!bad"? yes (end of list)
 LOG: MAIN
   => x <x@y> R=accept T=appendfile