-/* $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.
- 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. */
{ 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;
}
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);
- 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)) {
- 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;