Fix unsupported conversion

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

diff --git a/src/src/spf.h b/src/src/spf.h
index de7b741fdca78b7a4b5559c516e234b307d0fe39..455fbbfd939c2da14a4c571f29c3f6c2652504a2 100644 (file)
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -1,16 +1,21 @@
-/* $Cambridge: exim/src/src/spf.h,v 1.2 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/src/src/spf.h,v 1.7 2008/02/12 12:52:51 nm4 Exp $ */

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

- 
+

 /* Experimental SPF support.
    Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
    License: GPL */
 
 #ifdef EXPERIMENTAL_SPF
 
 /* Experimental SPF support.
    Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
    License: GPL */
 
 #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
+#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>
 


@@ -19,21 +24,12 @@ typedef struct spf_result_id {
   int    value;
 } spf_result_id;
 
   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