summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNigel Metheringham <nigel@exim.org>2010-05-29 19:23:25 +0000
committerNigel Metheringham <nigel@exim.org>2010-05-29 19:23:25 +0000
commit0d0c6357ebfc93f3119d2118dbeb62a8ad50c678 (patch)
tree843d0b0876759b9bc63b48977ba19c146172ed51 /doc
parentc1b141a8dd1114dc988751da299e1485aae81b20 (diff)
DKIM DNS TXT record bug fix. Fixes: #967
Diffstat (limited to 'doc')
-rw-r--r--doc/doc-docbook/spec.xfpt16
-rw-r--r--doc/doc-txt/ChangeLog5
2 files changed, 19 insertions, 2 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 6a1d7ce12..5385d8ead 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -1,4 +1,4 @@
-. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.72 2010/03/05 16:26:46 nm4 Exp $
+. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.73 2010/05/29 19:23:25 nm4 Exp $
.
. /////////////////////////////////////////////////////////////////////////////
. This is the primary source of the Exim Manual. It is an xfpt document that is
@@ -6628,6 +6628,20 @@ ${lookup dnsdb{>: a=host1.example}}
It is permitted to specify a space as the separator character. Further
white space is ignored.
+.new
+.cindex "TXT record" "in &(dnsdb)& lookup"
+For TXT records with multiple items of data, only the first item is returned,
+unless a separator for them is specified using a comma after the separator
+character followed immediately by the TXT record item separator. To concatenate
+items without a separator, use a semicolon instead.
+.code
+${lookup dnsdb{>\n,: txt=a.b.example}}
+${lookup dnsdb{>\n; txt=a.b.example}}
+.endd
+It is permitted to specify a space as the separator character. Further
+white space is ignored.
+.wen
+
.section "Pseudo dnsdb record types" "SECID66"
.cindex "MX record" "in &(dnsdb)& lookup"
By default, both the preference value and the host name are returned for
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a2434129c..372be8fdf 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.610 2010/05/29 19:16:50 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.611 2010/05/29 19:23:26 nm4 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -39,6 +39,9 @@ MH/01 Treat the transport option dkim_domain as a colon separated
NM/07 Null terminate DKIM strings, Null initialise DKIM variable
Bugzilla 985, 986. Patch by Simon Arlott
+NM/08 Bugzilla 967. DKIM DNS TXT record bug fix
+ Patch by Simon Arlott
+
Exim version 4.71
-----------------