tom 2005/06/27 16:28:45 BST
Modified files:
exim-src/src spf.c spf.h
Log:
Fix recursive inclusion of spf.h
Revision Changes Path
1.6 +12 -2 exim/exim-src/src/spf.c
1.6 +2 -16 exim/exim-src/src/spf.h
Index: spf.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spf.c 25 May 2005 20:07:55 -0000 1.5
+++ spf.c 27 Jun 2005 15:28:45 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spf.c,v 1.5 2005/05/25 20:07:55 tom Exp $ */
+/* $Cambridge: exim/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 @@
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 @@
}
#endif
-
Index: spf.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spf.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spf.h 24 Jun 2005 08:36:48 -0000 1.5
+++ spf.h 27 Jun 2005 15:28:45 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spf.h,v 1.5 2005/06/24 08:36:48 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/spf.h,v 1.6 2005/06/27 15:28:45 tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -11,32 +11,18 @@
#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 *);
