tidying

[user/henk/code/exim.git] / src / src / lookups / spf.c

diff --git a/src/src/lookups/spf.c b/src/src/lookups/spf.c
index 6defad72bf52ab021f325adc38402c6aeabbcd83..ef0c791cce6d840e2f7ea87f8d6efae3d95d77ab 100644 (file)
--- a/src/src/lookups/spf.c
+++ b/src/src/lookups/spf.c
@@ -32,16 +32,31 @@ static void dummy(int x) { dummy2(x-1); }
 #include <spf2/spf_dns_resolv.h>
 #include <spf2/spf_dns_cache.h>
 
+extern SPF_dns_server_t * SPF_dns_exim_new(int);
+
+
 static void *
 spf_open(uschar *filename, uschar **errmsg)
 {
-SPF_server_t *spf_server;
-if ((spf_server = SPF_server_new(SPF_DNS_CACHE, 0)))
-  return (void *) spf_server;
-*errmsg = US"SPF_server_new() failed";
-return NULL;
+SPF_dns_server_t * dc;
+SPF_server_t *spf_server = NULL;
+int debug = 0;
+
+DEBUG(D_lookup) debug = 1;
+
+if ((dc = SPF_dns_exim_new(debug)))
+  if ((dc = SPF_dns_cache_new(dc, NULL, debug, 8)))
+    spf_server = SPF_server_new_dns(dc, debug);
+
+if (!spf_server)
+  {
+  *errmsg = US"SPF_dns_exim_nnew() failed";
+  return NULL;
+  }
+return (void *) spf_server;
 }
 
+
 static void
 spf_close(void *handle)
 {
@@ -65,9 +80,11 @@ if (!(spf_request = SPF_request_new(spf_server)))
 
 #if HAVE_IPV6
 switch (string_is_ip_address(filename, NULL))
+#else
+switch (4)
+#endif
   {
   case 4:
-#endif
     if (!SPF_request_set_ipv4_str(spf_request, CS filename))
       break;
     *errmsg = string_sprintf("invalid IPv4 address '%s'", filename);
@@ -83,8 +100,8 @@ switch (string_is_ip_address(filename, NULL))
   default:
     *errmsg = string_sprintf("invalid IP address '%s'", filename);
     return FAIL;
-  }
 #endif
+  }
 
 if (SPF_request_set_env_from(spf_request, CS keystring))
     {