X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/de2e5b3dc657ad28e291f43b0850ab42e0012313..d447dbd160a0fb503ed1e763f3f23d28744b6ddd:/src/src/lookups/spf.c

diff --git a/src/src/lookups/spf.c b/src/src/lookups/spf.c
index 6defad72b..243c271a4 100644
--- a/src/src/lookups/spf.c
+++ b/src/src/lookups/spf.c
@@ -2,19 +2,18 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/*
- * Exim - SPF lookup module using libspf2
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * Copyright (c) 2005 Chris Webb, Arachsys Internet Services Ltd
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * Copyright (c) The Exim Maintainers 2016
- */
+/* Exim - SPF lookup module using libspf2
+   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Copyright (c) 2005 Chris Webb, Arachsys Internet Services Ltd
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+Copyright (c) The Exim Maintainers 2020
+*/
 
 #include "../exim.h"
 
@@ -32,16 +31,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_open(const 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)
 {
@@ -50,8 +64,8 @@ if (spf_server) SPF_server_free(spf_server);
 }
 
 static int
-spf_find(void *handle, uschar *filename, const uschar *keystring, int key_len,
-             uschar **result, uschar **errmsg, uint *do_cache)
+spf_find(void * handle, const uschar * filename, const uschar * keystring,
+  int key_len, uschar ** result, uschar ** errmsg, uint * do_cache)
 {
 SPF_server_t *spf_server = handle;
 SPF_request_t *spf_request;
@@ -65,9 +79,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 +99,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))
     {
@@ -94,6 +110,9 @@ if (SPF_request_set_env_from(spf_request, CS keystring))
 
 SPF_request_query_mailfrom(spf_request, &spf_response);
 *result = string_copy(US SPF_strresult(SPF_response_result(spf_response)));
+
+DEBUG(D_lookup) spf_response_debug(spf_response);
+
 SPF_response_free(spf_response);
 SPF_request_free(spf_request);
 return OK;