Debug: fix showing option name for list (vs. list content)

[exim.git] / test / stderr / 0094

diff --git a/test/stderr/0094 b/test/stderr/0094
index bd40fc7e7420833782e9bfcdc15cd6e355aa5d54..96b59005a86c4b4ef40a74afe4d8a089a20e4697 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -1,5 +1,7 @@
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)

->>> host in host_lookup? yes (matched "0.0.0.0/0")
+>>> host in host_lookup?
+>>>  list element: 0.0.0.0/0
+>>>  host in host_lookup? yes (matched "0.0.0.0/0")

 >>> looking up host name for V4NET.11.12.13
 LOG: no host name found for IP address V4NET.11.12.13
 >>> host in host_reject_connection? no (option unset)
 >>> looking up host name for V4NET.11.12.13
 LOG: no host name found for IP address V4NET.11.12.13
 >>> host in host_reject_connection? no (option unset)


@@ -8,32 +10,53 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>> 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)

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

 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :

+>>> host in ":"?
+>>>  list element: 

 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check domains = +local_domains
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check domains = +local_domains

->>> cam.ac.uk in "test.ex"? no (end of list)
+>>> cam.ac.uk in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    cam.ac.uk in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    cam.ac.uk in "test.ex"? no (end of list)
+>>>   end sublist local_domains

 >>> cam.ac.uk in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
 >>> cam.ac.uk in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts

+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>   start sublist relay_hosts
+>>>    host in "*.masq.test.ex"?
+>>>    ╎list element: *.masq.test.ex

 >>> sender host name required, to match against *.masq.test.ex
 >>> sender host name required, to match against *.masq.test.ex

->>> host in "*.masq.test.ex"? no (failed to find host name for V4NET.11.12.13)
->>> host in "+relay_hosts"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 26)
->>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>>    ╎host in "*.masq.test.ex"? no (failed to find host name for V4NET.11.12.13)
+>>>    end sublist relay_hosts
+>>>  host in "+relay_hosts"? no (end of list)
+>>>  accept: condition test failed in ACL "check_recipient"
+>>>  processing "deny" (TESTSUITE/test-config 26)
+>>>    message: relay not permitted
+>>>  deny: condition test succeeded in ACL "check_recipient"
+>>>  end of ACL "check_recipient": DENY

 LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
 LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)

->>> host in host_lookup? yes (matched "0.0.0.0/0")
+>>> host in host_lookup?
+>>>  list element: 0.0.0.0/0
+>>>  host in host_lookup? yes (matched "0.0.0.0/0")

 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"

+>>> ten-1.test.ex not in empty list (option unset? cannot trace name)
+>>> 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
 >>> host in host_reject_connection? no (option unset)
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in host_reject_connection? no (option unset)


@@ -45,16 +68,30 @@ LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.u
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :

+>>> host in ":"?
+>>>  list element: 

 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check domains = +local_domains
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check domains = +local_domains

->>> cam.ac.uk in "test.ex"? no (end of list)
+>>> cam.ac.uk in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    cam.ac.uk in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    cam.ac.uk in "test.ex"? no (end of list)
+>>>   end sublist local_domains

 >>> cam.ac.uk in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts
 >>> cam.ac.uk in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> check hosts = +relay_hosts

->>> host in "*.masq.test.ex"? no (end of list)
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>   start sublist relay_hosts
+>>>    host in "*.masq.test.ex"?
+>>>    ╎list element: *.masq.test.ex
+>>>    host in "*.masq.test.ex"? no (end of list)
+>>>   end sublist relay_hosts

 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 26)
 >>> host in "+relay_hosts"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 26)


@@ -78,18 +115,24 @@ sender_rcvhost = [V4NET.99.99.90]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.99.99.90]
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.99.99.90]

-host in host_lookup? yes (matched "0.0.0.0/0")
+host in host_lookup?
+ list element: 0.0.0.0/0
+  host in host_lookup? yes (matched "0.0.0.0/0")

 looking up host name for V4NET.99.99.90
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "oneback.test.ex"
   alias "host1.masq.test.ex"
 looking up host name for V4NET.99.99.90
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
 IP address lookup yielded "oneback.test.ex"
   alias "host1.masq.test.ex"

+oneback.test.ex not in empty list (option unset? cannot trace name)
+oneback.test.ex not in empty list (option unset? cannot trace name)

 DNS lookup of oneback.test.ex (A) using fakens
 DNS lookup of oneback.test.ex (A) succeeded
 oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 
 checking addresses for oneback.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.90 OK
 DNS lookup of oneback.test.ex (A) using fakens
 DNS lookup of oneback.test.ex (A) succeeded
 oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 
 checking addresses for oneback.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.90 OK

+host1.masq.test.ex not in empty list (option unset? cannot trace name)
+host1.masq.test.ex not in empty list (option unset? cannot trace name)

 DNS lookup of host1.masq.test.ex (A) using fakens
 DNS lookup of host1.masq.test.ex (A) succeeded
 host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 
 DNS lookup of host1.masq.test.ex (A) using fakens
 DNS lookup of host1.masq.test.ex (A) succeeded
 host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 


@@ -121,13 +164,21 @@ SMTP<< rcpt to:<userx@test.ex>
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = :
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = :

+host in ":"?
+ list element: 

 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 24)
 check domains = +local_domains
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 24)
 check domains = +local_domains

-test.ex in "test.ex"? yes (matched "test.ex")
-data from lookup saved for cache for +local_domains: key 'test.ex' value '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"?
+   ╎list element: test.ex
+   ╎test.ex in "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
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": ACCEPT
 SMTP>> 250 Accepted


@@ -135,16 +186,30 @@ SMTP<< rcpt to:<userx@cam.ac.uk>
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = :
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 23)
 check hosts = :

+host in ":"?
+ list element: 

 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 24)
 check domains = +local_domains
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 24)
 check domains = +local_domains

-cam.ac.uk in "test.ex"? no (end of list)
+cam.ac.uk in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+   cam.ac.uk in "test.ex"?
+   ╎list element: test.ex
+   cam.ac.uk in "test.ex"? no (end of list)
+  end sublist local_domains

 cam.ac.uk in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 25)
 check hosts = +relay_hosts
 cam.ac.uk in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 25)
 check hosts = +relay_hosts

-host in "*.masq.test.ex"? no (end of list)
+host in "+relay_hosts"?
+ list element: +relay_hosts
+  start sublist relay_hosts
+  host in "*.masq.test.ex"?
+   ╎list element: *.masq.test.ex
+  host in "*.masq.test.ex"? no (end of list)
+  end sublist relay_hosts

 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny" (TESTSUITE/test-config 26)
 host in "+relay_hosts"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
 processing "deny" (TESTSUITE/test-config 26)


@@ -157,6 +222,6 @@ LOG: MAIN REJECT
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from oneback.test.ex (test) [V4NET.99.99.90] closed by QUIT
+  SMTP connection from oneback.test.ex (test) [V4NET.99.99.90] D=qqs closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>