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.
Contributed by Michael Fischer v. Mollard.
TL/05 Rename SPF condition results err_perm and err_temp to standardized
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
+ results permerror and temperror. Previous values are deprecated but
+ still accepted. In a future release, err_perm and err_temp will be
+ completely removed, which will be a backward incompatibility if the
+ ACL tests for either of these two old results. Patch contributed by
user bes-internal on the mailing list.
JH/04 Add ${utf8clean:} operator. Contributed by Alex Rau.
user bes-internal on the mailing list.
JH/04 Add ${utf8clean:} operator. Contributed by Alex Rau.
processing, including Exim's SPF processing.
You may defer messages when this occurs.
(Changed in 4.83)
processing, including Exim's SPF processing.
You may defer messages when this occurs.
(Changed in 4.83)
+ o err_temp Same as permerror, deprecated in 4.83, will be
+ removed in a future release.
+ o err_perm Same as temperror, deprecated in 4.83, will be
+ removed in a future release.
You can prefix each string with an exclamation mark to invert
You can prefix each string with an exclamation mark to invert
-is meaning, for example "!fail" will match all results but
+its meaning, for example "!fail" will match all results but
"fail". The string list is evaluated left-to-right, in a
short-circuit fashion. When a string matches the outcome of
the SPF check, the condition succeeds. If none of the listed
"fail". The string list is evaluated left-to-right, in a
short-circuit fashion. When a string matches the outcome of
the SPF check, the condition succeeds. If none of the listed
{ 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;