BUGFIX: forced-fail smtp option tls_sni would dereference NULL

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

diff --git a/src/src/spf.h b/src/src/spf.h
index 30583f44066d2fd6137ec0331498d71a11934fbf..0ce5d007a9d9707aeaaa22494ae03189b07d6bed 100644 (file)
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/src/spf.h,v 1.4 2005/05/24 08:15:02 tom Exp $ */
-

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


@@ -11,34 +9,25 @@
 #ifdef EXPERIMENTAL_SPF
 
 /* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */
 #ifdef EXPERIMENTAL_SPF
 
 /* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */

+#ifndef HAVE_NS_TYPE

 #define HAVE_NS_TYPE
 #define HAVE_NS_TYPE

+#endif

 #include <spf2/spf.h>
 
 #include <spf2/spf.h>
 

-

 #include <spf2/spf_dns_resolv.h>
 #include <spf2/spf_dns_cache.h>
 
 #include <spf2/spf_dns_resolv.h>
 #include <spf2/spf_dns_cache.h>
 

-

 typedef struct spf_result_id {
   uschar *name;
   int    value;
 } spf_result_id;
 
 typedef struct spf_result_id {
   uschar *name;
   int    value;
 } spf_result_id;
 

-/* must be kept in numeric order */
-static spf_result_id spf_result_id_list[] = {
-  { US"pass", 0 },
-  { US"fail", 1 },
-  { US"softfail", 2 },
-  { US"neutral", 3 },
-  { US"err_perm", 4 },
-  { US"err_temp", 5 },
-  { US"none", 6 }
-};
-
-static int spf_result_id_list_size = sizeof(spf_result_id_list)/sizeof(spf_result_id);
-

 /* prototypes */
 int spf_init(uschar *,uschar *);
 /* prototypes */
 int spf_init(uschar *,uschar *);

-int spf_process(uschar **, uschar *);
+int spf_process(uschar **, uschar *, int);
+
+#define SPF_PROCESS_NORMAL  0
+#define SPF_PROCESS_GUESS   1
+#define SPF_PROCESS_FALLBACK    2

 
 #endif
 
 #endif