diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-03-26 13:49:52 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-03-26 13:49:52 +0100 |
| commit | 8f0776b59c787a5359599f552d6aa7270c66bad3 (patch) | |
| tree | 4c9b8c140807ebbe9f3d8b88972c057cb83fa799 | |
| parent | 4fe4d0b16321e3af984c3e595aaafbf60a0d0259 (diff) | |
| download | exim4-8f0776b59c787a5359599f552d6aa7270c66bad3.tar.gz | |
SPF: remove the deprecated "err_temp" and "err_perm" result names
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 9 | ||||
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | src/src/spf.c | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 814afc1eb..2dbe6d2d3 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -39349,18 +39349,11 @@ its domain as well. This should be treated like "none". .vitem &%permerror%& This indicates a syntax error in the SPF record of the queried domain. -You may deny messages when this occurs. (Changed in 4.83) +You may deny messages when this occurs. .vitem &%temperror%& This indicates a temporary error during all processing, including Exim's SPF processing. You may defer messages when this occurs. -(Changed in 4.83) - -.vitem &%err_temp%& -Same as permerror, deprecated in 4.83, will be removed in a future release. - -.vitem &%err_perm%& -Same as temperror, deprecated in 4.83, will be removed in a future release. .endlist You can prefix each string with an exclamation mark to invert diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 651508b7c..8e9ef4283 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -174,6 +174,10 @@ HS/03 Set a handler for SIGTERM and call exit(3) if running as PID 1. This JH/32 Bug 2258: Fix spool_wireformat in combination with LMTP transport. Previously the "final dot" had a newline after it; ensure it is CR,LF. +JH/33 SPF: remove support for the "spf" ACL condition outcome values "err_temp" + and "err_perm", deprecated since 4.83 when the RFC-defined words + "temperror" and "permerror" were introduced. + Exim version 4.90 ----------------- diff --git a/src/src/spf.c b/src/src/spf.c index 0f0a05d4d..a203c07ba 100644 --- a/src/src/spf.c +++ b/src/src/spf.c @@ -22,8 +22,6 @@ static spf_result_id spf_result_id_list[] = { { US"fail", 3 }, { US"softfail", 4 }, { US"none", 5 }, - { US"err_temp", 6 }, /* Deprecated Apr 2014 */ - { US"err_perm", 7 }, /* Deprecated Apr 2014 */ { US"temperror", 6 }, /* RFC 4408 defined */ { US"permerror", 7 } /* RFC 4408 defined */ }; |