diff options
| author | Phil Pennock <pdp@exim.org> | 2012-05-18 15:35:32 -0400 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2012-05-18 15:35:32 -0400 |
| commit | 8ee4b30ec5b2767efb8d24b3dd9c2dda33679f0b (patch) | |
| tree | 2163a553cd775fdc04c97d58e33e32a504a81f16 /doc | |
| parent | 619b2b25bb4e66b2b2a27d3cc84d6ba00ede0ba4 (diff) | |
SPF multiple strings join on "".
Patch from Janne Snabb.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 8 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index b650fc39f..c4c181ef1 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -6790,14 +6790,16 @@ white space is ignored. .cindex "TXT record" "in &(dnsdb)& lookup" .cindex "SPF record" "in &(dnsdb)& lookup" .new -For TXT and SPF records with multiple items of data, only the first item is returned, +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/SPF record item separator. To concatenate -items without a separator, use a semicolon instead. +character followed immediately by the TXT record item separator. To concatenate +items without a separator, use a semicolon instead. For SPF records the +default behaviour is to concatenate multiple items without using a separator. .wen .code ${lookup dnsdb{>\n,: txt=a.b.example}} ${lookup dnsdb{>\n; txt=a.b.example}} +${lookup dnsdb{spf=example.org}} .endd It is permitted to specify a space as the separator character. Further white space is ignored. diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index bf4ddf1af..b3815cd45 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -113,6 +113,8 @@ PP/25 Revamped GnuTLS support, passing tls_require_ciphers to PP/26 Added EXPERIMENTAL_OCSP for OpenSSL. PP/27 Applied dnsdb SPF support patch from Janne Snabb. + Applied second patch from Janne, implementing suggestion to default + multiple-strings-in-record handling to match SPF spec. JH/04 Added expansion variable $tod_epoch_l for a higher-precision time. |