Testsuite outputs: ipv6

diff --git a/test/log/1003 b/test/log/1003
index e11b7508adb11eb327c0736e9e43db16d6910403..006910adca4b220dd24bdef807eff7a6b8152804 100644 (file)
--- a/test/log/1003
+++ b/test/log/1003
@@ -18,7 +18,7 @@
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 (IPv6 and IPv4)
 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
 1999-03-02 09:44:33 no host name found for IP address ::1
 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [::1] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex
 1999-03-02 09:44:33 no host name found for IP address ::1

diff --git a/test/stderr/1000 b/test/stderr/1000
index faa237ea81e3ffa40b771d3caff38bcde9a6a1a9..669ddb4c0489a37846f143a783f8634d5de06524 100644 (file)
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -17,6 +17,7 @@ LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
 >>> 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 hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? yes (matched "*")
 >>> looking up host name for V6NET:1234:0005:0006:0007:0008:0abc:000d

diff --git a/test/stderr/1002 b/test/stderr/1002
index 5a91a33c23475efde15876ac74a36a4d71a30313..d65fff6b99a5af1a8861e13dad5888d714d4c5ab 100644 (file)
--- a/test/stderr/1002
+++ b/test/stderr/1002
@@ -14,6 +14,7 @@
 >>> require: condition test succeeded in ACL "acl_rcpt_1"
 >>> processing "accept"
 >>> accept: condition test succeeded in ACL "acl_rcpt_1"
+>>> end of ACL "acl_rcpt_1": ACCEPT
 >>> using ACL "acl_rcpt_6"
 >>> processing "require"
 >>>   message: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
@@ -24,4 +25,5 @@
 >>> ten-1.test.ex in hosts_treat_as_local? no (end of list)
 >>> mxt11a.test.ex in "<+ @mx_any/ignore=<;127.0.0.1;::1"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_6"
+>>> end of ACL "acl_rcpt_6": not OK
 LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <6@mxt11a.test.ex>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1