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
Collect spool-layout code to one file
[exim.git]
/
src
/
src
/
spf.c
diff --git
a/src/src/spf.c
b/src/src/spf.c
index ddbb938e473c9c959622d685e37514560db762a4..9ab56af23516ee6f75ccd56a05061ed7dc32ce87 100644
(file)
--- a/
src/src/spf.c
+++ b/
src/src/spf.c
@@
-1,12
+1,12
@@
-/* $Cambridge: exim/src/src/spf.c,v 1.9 2009/11/11 10:08:02 nm4 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/* Experimental SPF support.
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/* Experimental SPF support.
- Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
- License: GPL */
+ Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2014
+ License: GPL
+ Copyright (c) The Exim Maintainers 2016
+*/
/* Code for calling spf checks via libspf-alt. Called from acl.c. */
/* Code for calling spf checks via libspf-alt. Called from acl.c. */
@@
-21,8
+21,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"err_temp", 6 },
- { US"err_perm", 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;
@@
-44,22
+46,23
@@
int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
}
if (SPF_server_set_rec_dom(spf_server, CS primary_hostname)) {
}
if (SPF_server_set_rec_dom(spf_server, CS primary_hostname)) {
- debug_printf("spf: SPF_server_set_rec_dom(
) failed.\n"
);
+ debug_printf("spf: SPF_server_set_rec_dom(
\"%s\") failed.\n", primary_hostname
);
spf_server = NULL;
return 0;
}
spf_request = SPF_request_new(spf_server);
spf_server = NULL;
return 0;
}
spf_request = SPF_request_new(spf_server);
- if (SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr)) {
- debug_printf("spf: SPF_request_set_ipv4_str() failed.\n");
+ if (SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr)
+ && SPF_request_set_ipv6_str(spf_request, CS spf_remote_addr)) {
+ debug_printf("spf: SPF_request_set_ipv4_str() and SPF_request_set_ipv6_str() failed [%s]\n", spf_remote_addr);
spf_server = NULL;
spf_request = NULL;
return 0;
}
if (SPF_request_set_helo_dom(spf_request, CS spf_helo_domain)) {
spf_server = NULL;
spf_request = NULL;
return 0;
}
if (SPF_request_set_helo_dom(spf_request, CS spf_helo_domain)) {
- debug_printf("spf: SPF_set_helo_dom(
) failed.\n"
);
+ debug_printf("spf: SPF_set_helo_dom(
\"%s\") failed.\n", spf_helo_domain
);
spf_server = NULL;
spf_request = NULL;
return 0;
spf_server = NULL;
spf_request = NULL;
return 0;
@@
-73,9
+76,9
@@
int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
context (if any), retrieves the result, sets up expansion
strings and evaluates the condition outcome. */
context (if any), retrieves the result, sets up expansion
strings and evaluates the condition outcome. */
-int spf_process(uschar **listptr, uschar *spf_envelope_sender, int action) {
+int spf_process(
const
uschar **listptr, uschar *spf_envelope_sender, int action) {
int sep = 0;
int sep = 0;
- uschar *list = *listptr;
+
const
uschar *list = *listptr;
uschar *spf_result_id;
uschar spf_result_id_buffer[128];
int rc = SPF_RESULT_PERMERROR;
uschar *spf_result_id;
uschar spf_result_id_buffer[128];
int rc = SPF_RESULT_PERMERROR;