diff options
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/doc-txt/experimental-spec.txt | 14 | ||||
| -rw-r--r-- | src/src/spf.c | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 889d6a464..1ca558e34 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -41,6 +41,10 @@ TL/04 Add verify = header_names_ascii check to reject email with non-ASCII characters in header names, implemented as a verify condition. Contributed by Michael Fischer v. Mollard. +TL/05 Rename SPF condition results err_perm and err_temp to standardized + results permerror and temperror. Is a backward incompatibility if + the ACL tests for either of these two results. Patch contributed by + user bes-internal on the mailing list. Exim version 4.82 ----------------- diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt index b80e02b4c..2395267e8 100644 --- a/doc/doc-txt/experimental-spec.txt +++ b/doc/doc-txt/experimental-spec.txt @@ -452,12 +452,14 @@ which the spf condition should succeed. Valid strings are: This means the queried domain has published a SPF record, but wants to allow outside servers to send mail under its domain as well. - o err_perm This indicates a syntax error in the SPF - record of the queried domain. This should be - treated like "none". - o err_temp This indicates a temporary error during all + This should be treated like "none". + o 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) + o 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) You can prefix each string with an exclamation mark to invert is meaning, for example "!fail" will match all results but @@ -510,8 +512,8 @@ variables. $spf_result This contains the outcome of the SPF check in string form, - one of pass, fail, softfail, none, neutral, err_perm or - err_temp. + one of pass, fail, softfail, none, neutral, permerror or + temperror. $spf_smtp_comment This contains a string that can be used in a SMTP response diff --git a/src/src/spf.c b/src/src/spf.c index 4bbabbf4c..4f0094fc4 100644 --- a/src/src/spf.c +++ b/src/src/spf.c @@ -19,8 +19,8 @@ static spf_result_id spf_result_id_list[] = { { US"fail", 3 }, { US"softfail", 4 }, { US"none", 5 }, - { US"err_temp", 6 }, - { US"err_perm", 7 } + { US"temperror", 6 }, + { US"permerror", 7 } }; SPF_server_t *spf_server = NULL; |