fix BATV prvs expiry calculation for one rollover case

[exim.git] / src / src / spf.c

diff --git a/src/src/spf.c b/src/src/spf.c
index 48150eb01ba0ccf880c0ab7172e72fffecab9661..532f814221bb2e00b49f11e55e3057966adedc68 100644 (file)
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spf.c,v 1.6 2005/06/27 15:28:45 tom Exp $ */
+/* $Cambridge: exim/src/src/spf.c,v 1.8 2008/02/12 12:52:51 nm4 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -43,6 +43,12 @@ int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
     return 0;
   }
 
     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)) {


@@ -67,7 +73,7 @@ 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 spf_process(uschar **listptr, uschar *spf_envelope_sender, int action) {

   int sep = 0;
   uschar *list = *listptr;
   uschar *spf_result_id;
   int sep = 0;
   uschar *list = *listptr;
   uschar *spf_result_id;


@@ -87,7 +93,10 @@ int spf_process(uschar **listptr, uschar *spf_envelope_sender) {
   }
 
   /* get SPF result */
   }
 
   /* get SPF result */

-  SPF_request_query_mailfrom(spf_request, &spf_response);
+  if (action == SPF_PROCESS_FALLBACK)
+    SPF_request_query_fallback(spf_request, &spf_response, spf_guess);
+  else
+    SPF_request_query_mailfrom(spf_request, &spf_response);

 
   /* set up expansion items */
   spf_header_comment     = (uschar *)SPF_response_get_header_comment(spf_response);
 
   /* set up expansion items */
   spf_header_comment     = (uschar *)SPF_response_get_header_comment(spf_response);


@@ -100,6 +109,10 @@ int spf_process(uschar **listptr, uschar *spf_envelope_sender) {
   /* We got a result. Now see if we should return OK or FAIL for it */
   SPF_EVALUATE:
   debug_printf("SPF result is %s (%d)\n", SPF_strresult(rc), rc);
   /* We got a result. Now see if we should return OK or FAIL for it */
   SPF_EVALUATE:
   debug_printf("SPF result is %s (%d)\n", SPF_strresult(rc), rc);

+
+  if (action == SPF_PROCESS_GUESS && (!strcmp (SPF_strresult(rc), "none")))
+    return spf_process(listptr, spf_envelope_sender, SPF_PROCESS_FALLBACK);
+

   while ((spf_result_id = string_nextinlist(&list, &sep,
                                      spf_result_id_buffer,
                                      sizeof(spf_result_id_buffer))) != NULL) {
   while ((spf_result_id = string_nextinlist(&list, &sep,
                                      spf_result_id_buffer,
                                      sizeof(spf_result_id_buffer))) != NULL) {