X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/7156b1ef48de59429a3d81d966ef151edc1c01ad..ec4b68e5d820109e5954329013a911d4032bc4dc:/src/src/spf.c

diff --git a/src/src/spf.c b/src/src/spf.c
index ddbb938e4..4bbabbf4c 100644
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/src/spf.c,v 1.9 2009/11/11 10:08:02 nm4 Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
@@ -44,22 +42,23 @@ int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
   }
 
   if (SPF_server_set_rec_dom(spf_server, CS primary_hostname)) {
-    debug_printf("spf: SPF_server_set_rec_dom() failed.\n");
+    debug_printf("spf: SPF_server_set_rec_dom(\"%s\") failed.\n", primary_hostname);
     spf_server = NULL;
     return 0;
   }
 
   spf_request = SPF_request_new(spf_server);
 
-  if (SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr)) {
-    debug_printf("spf: SPF_request_set_ipv4_str() failed.\n");
+  if (SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr)
+      && SPF_request_set_ipv6_str(spf_request, CS spf_remote_addr)) {
+    debug_printf("spf: SPF_request_set_ipv4_str() and SPF_request_set_ipv6_str() failed [%s]\n", spf_remote_addr);
     spf_server = NULL;
     spf_request = NULL;
     return 0;
   }
 
   if (SPF_request_set_helo_dom(spf_request, CS spf_helo_domain)) {
-    debug_printf("spf: SPF_set_helo_dom() failed.\n");
+    debug_printf("spf: SPF_set_helo_dom(\"%s\") failed.\n", spf_helo_domain);
     spf_server = NULL;
     spf_request = NULL;
     return 0;