summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTodd Lyons <tlyons@exim.org>2014-04-15 13:10:59 -0700
committerTodd Lyons <tlyons@exim.org>2014-04-15 13:10:59 -0700
commit982650eceba2e54d2022f92b142b85fa083d3d13 (patch)
tree5008c3e0e00bd75bccdb5b48103127b6778e6376 /src
parent8c8b8274fc537766da72eab2f79a62d1603d6638 (diff)
Add back deprecated SPF error conditions
Previous patch introduced a change that could break existing SPF configurations. Add back the two non-standard "err_temp" and "err_perm" result values, with note that it is deprecated and will be removed in a future release.
Diffstat (limited to 'src')
-rw-r--r--src/src/spf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/src/spf.c b/src/src/spf.c
index 4f0094fc4..0f215e3b5 100644
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -19,8 +19,10 @@ static spf_result_id spf_result_id_list[] = {
{ US"fail", 3 },
{ US"softfail", 4 },
{ US"none", 5 },
- { US"temperror", 6 },
- { US"permerror", 7 }
+ { 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 */
};
SPF_server_t *spf_server = NULL;