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
Add queue_only_load_latch.
[exim.git]
/
src
/
src
/
spf.c
diff --git
a/src/src/spf.c
b/src/src/spf.c
index 6fd7445615ceb95a86087bbcceb1640dc860bfeb..0d2316e2e88064ce2f284dc532e4e5c3e7e29288 100644
(file)
--- a/
src/src/spf.c
+++ b/
src/src/spf.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/spf.c,v 1.
4 2005/05/24 08:15:02
tom Exp $ */
+/* $Cambridge: exim/src/src/spf.c,v 1.
7 2007/05/17 19:55:10
tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-13,6
+13,18
@@
#include "exim.h"
#ifdef EXPERIMENTAL_SPF
#include "exim.h"
#ifdef EXPERIMENTAL_SPF
+/* must be kept in numeric order */
+static spf_result_id spf_result_id_list[] = {
+ { US"invalid", 0},
+ { US"neutral", 1 },
+ { US"pass", 2 },
+ { US"fail", 3 },
+ { US"softfail", 4 },
+ { US"none", 5 },
+ { US"err_temp", 6 },
+ { US"err_perm", 7 }
+};
+
SPF_server_t *spf_server = NULL;
SPF_request_t *spf_request = NULL;
SPF_response_t *spf_response = NULL;
SPF_server_t *spf_server = NULL;
SPF_request_t *spf_request = NULL;
SPF_response_t *spf_response = NULL;
@@
-23,15
+35,20
@@
SPF_response_t *spf_response_2mx = NULL;
same host with the same HELO string) */
int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
same host with the same HELO string) */
int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
- uschar *p;
- spf_server = SPF_server_new(SPF_DNS_CACHE,
1
);
+ spf_server = SPF_server_new(SPF_DNS_CACHE,
0
);
if ( spf_server == NULL ) {
debug_printf("spf: SPF_server_new() failed.\n");
return 0;
}
if ( spf_server == NULL ) {
debug_printf("spf: SPF_server_new() failed.\n");
return 0;
}
+ if (SPF_server_set_rec_dom(spf_server, primary_hostname)) {
+ debug_printf("spf: SPF_server_set_rec_dom() failed.\n");
+ spf_server = NULL;
+ return 0;
+ }
+
spf_request = SPF_request_new(spf_server);
if (SPF_request_set_ipv4_str(spf_request, spf_remote_addr)) {
spf_request = SPF_request_new(spf_server);
if (SPF_request_set_ipv4_str(spf_request, spf_remote_addr)) {
@@
-112,4
+129,3
@@
int spf_process(uschar **listptr, uschar *spf_envelope_sender) {
}
#endif
}
#endif
-