git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix dkim for no-key case under SENDFILE compile. Bug 934
[exim.git]
/
src
/
src
/
spf.c
diff --git
a/src/src/spf.c
b/src/src/spf.c
index 4f0094fc48081a64534f31ec46f7156f31ab58e9..7167f5778c511d1f90c1dd1f3951ee9119b939cf 100644
(file)
--- a/
src/src/spf.c
+++ b/
src/src/spf.c
@@
-3,7
+3,7
@@
*************************************************/
/* Experimental SPF support.
*************************************************/
/* Experimental SPF support.
- Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
+ Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
- 2014
License: GPL */
/* Code for calling spf checks via libspf-alt. Called from acl.c. */
License: GPL */
/* Code for calling spf checks via libspf-alt. Called from acl.c. */
@@
-19,8
+19,10
@@
static spf_result_id spf_result_id_list[] = {
{ US"fail", 3 },
{ US"softfail", 4 },
{ US"none", 5 },
{ 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;
};
SPF_server_t *spf_server = NULL;