Logging: connection_id

[exim.git] / test / stderr / 1000

diff --git a/test/stderr/1000 b/test/stderr/1000
index 89a6d2f9dc87ffef041941188ca0cade5b833a87..f1a1de6a460133d5fa5ed28b4623b42bffde255c 100644 (file)
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -10,7 +10,9 @@
 >>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 >>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex

->>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "2001:ab8:37f:20:0:0:0:1")
+>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"?
+>>>  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
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> warn: condition test succeeded in ACL "check_connect"
 LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
 >>> processing "accept" (TESTSUITE/test-config 24)


@@ -19,7 +21,9 @@ LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
 >>> accept: condition test succeeded in ACL "check_connect"
 >>> end of ACL "check_connect": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> accept: condition test succeeded in ACL "check_connect"
 >>> end of ACL "check_connect": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)

->>> host in host_lookup? yes (matched "*")
+>>> 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
 >>> IP address lookup yielded "test3.ipv6.test.ex"
 >>> checking addresses for test3.ipv6.test.ex
 >>> looking up host name for V6NET:1234:0005:0006:0007:0008:0abc:000d
 >>> IP address lookup yielded "test3.ipv6.test.ex"
 >>> checking addresses for test3.ipv6.test.ex


@@ -34,6 +38,9 @@ LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
 >>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 >>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex

+>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"?
+>>>  list element: 2001:ab8:37f:20:0:0:0:1
+>>>  list element: v6.test.ex

 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=v6.test.ex address=V6NET:ffff:836f:a00:a:800:200a:c032
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=v6.test.ex address=V6NET:ffff:836f:a00:a:800:200a:c032


@@ -57,10 +64,13 @@ LOG: H=test3.ipv6.test.ex [V6NET:1234:0005:0006:0007:0008:0abc:000d] rejected co
 >>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
 >>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex

+>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"?
+>>>  list element: 2001:ab8:37f:20:0:0:0:1
+>>>  list element: v6.test.ex

 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=v6.test.ex address=V6NET:ffff:836f:a00:a:800:200a:c032
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   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")
+>>>  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
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> warn: condition test succeeded in ACL "check_connect"
 LOG: H=[V6NET:ffff:836f:0a00:000a:0800:200a:c032] Warning: matched hostlist
 >>> processing "accept" (TESTSUITE/test-config 24)