Debug: indent DNS ops

[exim.git] / test / stderr / 1000

diff --git a/test/stderr/1000 b/test/stderr/1000
index 97e99b951564ed9036593d965f7b53f6dac798f2..4d20918e43d6b5b1dc94524f8029a09471440070 100644 (file)
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -14,20 +14,23 @@
 >>>  list element: 2001:ab8:37f:20:0:0:0:1
 >>>  host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "2001:ab8:37f:20:0:0:0:1")
 >>> warn: condition test succeeded in ACL "check_connect"
 >>>  list element: 2001:ab8:37f:20:0:0:0:1
 >>>  host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "2001:ab8:37f:20:0:0:0:1")
 >>> warn: condition test succeeded in ACL "check_connect"

-LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
+LOG: H=[2001:ab8:37f:20::1] Warning: matched hostlist

 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}

->>>                 = true
->>> accept: condition test succeeded in ACL "check_connect"
->>> end of ACL "check_connect": ACCEPT
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
+>>>                 = 
+>>> accept: condition test failed in ACL "check_connect"
+>>> end of ACL "check_connect": implicit DENY
+LOG: H=[2001:ab8:37f:20::1] rejected connection in "connect" ACL

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup?
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup?
 >>>  list element: *
 >>>  host in host_lookup? yes (matched "*")

->>> looking up host name for V6NET:1234:0005:0006:0007:0008:0abc:000d
+>>> looking up host name for V6NET:1234:5:6:7:8:abc:d

 >>> IP address lookup yielded "test3.ipv6.test.ex"
 >>> IP address lookup yielded "test3.ipv6.test.ex"

+>>>  check dnssec require list
+>>>   test3.ipv6.test.ex not in empty list (option unset? cannot trace name)
+>>>  check dnssec request list
+>>>   test3.ipv6.test.ex not in empty list (option unset? cannot trace name)

 >>> checking addresses for test3.ipv6.test.ex
 >>>   V6NET:1234:5:6:7:8:abc:d OK
 >>> host in host_reject_connection? no (option unset)
 >>> checking addresses for test3.ipv6.test.ex
 >>>   V6NET:1234:5:6:7:8:abc:d OK
 >>> host in host_reject_connection? no (option unset)


@@ -53,7 +56,7 @@ MUNGED: ::1 will be omitted in what follows
 >>>                 = 
 >>> accept: condition test failed in ACL "check_connect"
 >>> end of ACL "check_connect": implicit DENY
 >>>                 = 
 >>> accept: condition test failed in ACL "check_connect"
 >>> end of ACL "check_connect": implicit DENY

-LOG: H=test3.ipv6.test.ex [V6NET:1234:0005:0006:0007:0008:0abc:000d] rejected connection in "connect" ACL
+LOG: H=test3.ipv6.test.ex [V6NET:1234:5:6:7:8:abc:d] rejected connection in "connect" ACL

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -74,10 +77,10 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=v6.test.ex address=V6NET:ffff:836f:a00:a:800:200a:c032
 >>>  host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "v6.test.ex")
 >>> warn: condition test succeeded in ACL "check_connect"
 >>>   name=v6.test.ex address=V6NET:ffff:836f:a00:a:800:200a:c032
 >>>  host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "v6.test.ex")
 >>> warn: condition test succeeded in ACL "check_connect"

-LOG: H=[V6NET:ffff:836f:0a00:000a:0800:200a:c032] Warning: matched hostlist
+LOG: H=[V6NET:ffff:836f:a00:a:800:200a:c032] Warning: matched hostlist

 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
 >>>                 = 
 >>> accept: condition test failed in ACL "check_connect"
 >>> end of ACL "check_connect": implicit DENY
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
 >>>                 = 
 >>> accept: condition test failed in ACL "check_connect"
 >>> end of ACL "check_connect": implicit DENY

-LOG: H=[V6NET:ffff:836f:0a00:000a:0800:200a:c032] rejected connection in "connect" ACL
+LOG: H=[V6NET:ffff:836f:a00:a:800:200a:c032] rejected connection in "connect" ACL