Fix recursive inclusion of spf.h

diff --git a/src/src/spf.c b/src/src/spf.c
index 23c02be208286b1195606f21e5d73e8d4effc737..48150eb01ba0ccf880c0ab7172e72fffecab9661 100644 (file)
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spf.c,v 1.5 2005/05/25 20:07:55 tom Exp $ */
+/* $Cambridge: exim/src/src/spf.c,v 1.6 2005/06/27 15:28:45 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -13,6 +13,18 @@
 #include "exim.h"
 #ifdef EXPERIMENTAL_SPF
 
+/* must be kept in numeric order */
+static spf_result_id spf_result_id_list[] = {
+  { US"invalid", 0},
+  { US"neutral", 1 },
+  { US"pass", 2 },
+  { US"fail", 3 },
+  { US"softfail", 4 },
+  { US"none", 5 },
+  { US"err_temp", 6 },
+  { US"err_perm", 7 }
+};
+
 SPF_server_t    *spf_server = NULL;
 SPF_request_t   *spf_request = NULL;
 SPF_response_t  *spf_response = NULL;
@@ -23,7 +35,6 @@ SPF_response_t  *spf_response_2mx = NULL;
    same host with the same HELO string) */
 
 int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
-  uschar *p;
 
   spf_server = SPF_server_new(SPF_DNS_CACHE, 0);
 
@@ -112,4 +123,3 @@ int spf_process(uschar **listptr, uschar *spf_envelope_sender) {
 }
 
 #endif
-

diff --git a/src/src/spf.h b/src/src/spf.h
index 4338fd8e6bfd5745a880ac18161f4488a732e7bf..3e014bdafe30ae5587e7d314633d900c3d0badb0 100644 (file)
--- a/src/src/spf.h
+++ b/src/src/spf.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spf.h,v 1.5 2005/06/24 08:36:48 tom Exp $ */
+/* $Cambridge: exim/src/src/spf.h,v 1.6 2005/06/27 15:28:45 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -11,33 +11,19 @@
 #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_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"invalid", 0},
-  { US"neutral", 1 },
-  { US"pass", 2 },
-  { US"fail", 3 },
-  { US"softfail", 4 },
-  { US"none", 5 },
-  { US"err_temp", 6 },
-  { US"err_perm", 7 }
-};
-
-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 *);