Merge branch 'debian'
[hcoop/debian/exim4.git] / debian / patches / 75_06-Docs-Add-note-on-lsearch-for-IPv4-mapped-IPv6-addres.patch
CommitLineData
01e60269
AM
1From 8dde16b89efe2138f92cbfa6c59fb31dc80ec22a Mon Sep 17 00:00:00 2001
2From: Jeremy Harris <jgh146exb@wizmail.org>
3Date: Tue, 19 Feb 2019 14:45:27 +0000
4Subject: [PATCH 2/5] Docs: Add note on lsearch for IPv4-mapped IPv6 addresses
5
6Cherry-picked from: 52af443324, c77d3d85fe
7---
8 doc/doc-docbook/spec.xfpt | 11 ++++++++++-
9 doc/ChangeLog | 2 +-
10 2 files changed, 11 insertions(+), 2 deletions(-)
11
12--- a/doc/ChangeLog
13+++ b/doc/ChangeLog
14@@ -18,7 +18,7 @@ JH/07 GnuTLS: Our use of late (post-hand
15 TLS connection attempt, so that the normal retry-in-clear can work (if
16 suitably configured).
17
18-JB/01 BZg 2375: fix expansions of 822 addresses having comments in local-part
19+JB/01 Bug 2375: fix expansions of 822 addresses having comments in local-part
20 and/or domain. Found and fixed by Jason Betts.
21
22
23--- a/doc/spec.txt
24+++ b/doc/spec.txt
25@@ -6302,6 +6302,10 @@ The following single-key lookup types ar
26 implicit key is the host's IP address rather than its name (see section
27 10.12).
28
29+ Warning 3: Do not use an IPv4-mapped IPv6 address for a key; use the
30+ IPv4, in dotted-quad form. (Exim converts IPv4-mapped IPv6 addresses to
31+ this notation before executing the lookup.)
32+
33 * lsearch: The given file is a text file that is searched linearly for a line
34 beginning with the search key, terminated by a colon or white space or the
35 end of the line. The search is case-insensitive; that is, upper and lower
36@@ -8003,7 +8007,11 @@ quote keys was made available in lsearch
37 implemented iplsearch files do require colons in IPv6 keys (notated using the
38 quoting facility) so as to distinguish them from IPv4 keys. For this reason,
39 when the lookup type is iplsearch, IPv6 addresses are converted using colons
40-and not dots. In all cases, full, unabbreviated IPv6 addresses are always used.
41+and not dots.
42+
43+In all cases except IPv4-mapped IPv6, full, unabbreviated IPv6 addresses
44+are always used. The latter are converted to IPv4 addresses, in dotted-quad
45+form.
46
47 Ideally, it would be nice to tidy up this anomalous situation by changing to
48 colons in all cases, given that quoting is now available for lsearch. However,