Gitweb:
https://git.exim.org/exim.git/commitdiff/82ab9af25b43cb3b56a95383eba52a866400911a
Commit: 82ab9af25b43cb3b56a95383eba52a866400911a
Parent: cfc6689a7a29220a44457961283773fdbfdce3ef
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Apr 14 12:15:38 2024 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Apr 14 12:15:38 2024 +0100
Testsuite: output changes resulting
Broken-by: e4cdc6558fcf
---
test/stderr/1000 | 17 +++++++++--------
test/stdout/1000 | 9 ++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/test/stderr/1000 b/test/stderr/1000
index f1a1de6a4..0eb94285d 100644
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -14,17 +14,18 @@
>>> 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}}
->>> = true
->>> accept: condition test succeeded in ACL "check_connect"
->>> end of ACL "check_connect": ACCEPT
+>>> =
+>>> 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 "*")
->>> 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"
>>> checking addresses for test3.ipv6.test.ex
>>> V6NET:1234:5:6:7:8:abc:d OK
@@ -51,7 +52,7 @@ MUNGED: ::1 will be omitted in what follows
>>> =
>>> 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)
@@ -72,10 +73,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"
-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
-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
diff --git a/test/stdout/1000 b/test/stdout/1000
index b9ec648b7..00a85edfc 100644
--- a/test/stdout/1000
+++ b/test/stdout/1000
@@ -1,18 +1,17 @@
-**** SMTP testing session as if from host 2001:0ab8:037f:0020:0000:0000:0000:0001
+**** SMTP testing session as if from host 2001:ab8:37f:20::1
**** but without any ident (RFC 1413) callback.
**** This is not for real!
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-421 myhost.test.ex lost input connection
+550 Administrative prohibition
-**** SMTP testing session as if from host V6NET:1234:0005:0006:0007:0008:0abc:000d
+**** SMTP testing session as if from host V6NET:1234:5:6:7:8:abc:d
**** but without any ident (RFC 1413) callback.
**** This is not for real!
550 Administrative prohibition
-**** SMTP testing session as if from host V6NET:ffff:836f:0a00:000a:0800:200a:c032
+**** SMTP testing session as if from host V6NET:ffff:836f:a00:a:800:200a:c032
**** but without any ident (RFC 1413) callback.
**** This is not for real!
--
## subscription configuration (requires account):
##
https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at
http://www.exim.org/
## Please use the Wiki with this list -
http://wiki.exim.org/
