X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/384152a6b0cce686255894a502e4b88743abd356..e34f8ca2022e340d3c0e36260a0232fab306dfcc:/src/src/spf.h

diff --git a/src/src/spf.h b/src/src/spf.h
index 30583f440..23ad325f1 100644
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -1,44 +1,35 @@
-/* $Cambridge: exim/src/src/spf.h,v 1.4 2005/05/24 08:15:02 tom Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /* Experimental SPF support.
    Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
-   License: GPL */
+   License: GPL
+   Copyright (c) The Exim Maintainers 2016
+*/
 
-#ifdef EXPERIMENTAL_SPF
+#ifdef SUPPORT_SPF
 
 /* Yes, we do have ns_type. spf.h redefines it if we don't set this. Doh */
-#define HAVE_NS_TYPE
+#ifndef HAVE_NS_TYPE
+# define HAVE_NS_TYPE
+#endif
 #include <spf2/spf.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;
 
-/* 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 *);
-int spf_process(uschar **, uschar *);
+BOOL spf_init(uschar *,uschar *);
+int  spf_process(const uschar **, uschar *, int);
+
+#define SPF_PROCESS_NORMAL  0
+#define SPF_PROCESS_GUESS   1
+#define SPF_PROCESS_FALLBACK    2
 
 #endif