SPF: fix handling mix of spf and other txt records. Bug 2499

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

diff --git a/src/src/spf.h b/src/src/spf.h
index 3d5f621fd6b578f0db1e75b43739446cb6794d89..1c87669f4bc44d9802c8d2ad5fd8234d8caf273c 100644 (file)
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -4,13 +4,15 @@
 
 /* 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 */
-#ifndef HAVE_NS_TYPE
-#define HAVE_NS_TYPE
+#if !defined(HAVE_NS_TYPE) && defined(NS_INADDRSZ)
+# define HAVE_NS_TYPE
 #endif
 #include <spf2/spf.h>
 
@@ -23,8 +25,9 @@ typedef struct spf_result_id {
 } spf_result_id;
 
 /* prototypes */
-int spf_init(uschar *,uschar *);
-int spf_process(const uschar **, uschar *, int);
+BOOL spf_init(void);
+BOOL spf_conn_init(uschar *, uschar *);
+int  spf_process(const uschar **, uschar *, int);
 
 #define SPF_PROCESS_NORMAL  0
 #define SPF_PROCESS_GUESS   1