From: Wolfgang Breyha <wbreyha@gmx.net>
Date: Tue, 7 Jan 2020 13:31:20 +0000 (+0000)
Subject: SPF: switch to NO_DATA for SPF-rr lookups.  Bug 1294
X-Git-Tag: exim-4_94_RC0~171
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/549d36ddec8c419af2223cc83162f58e9106650f

SPF: switch to NO_DATA for SPF-rr lookups.  Bug 1294
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b904aa99c..ce225e949 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -78,8 +78,8 @@ JH/18 Authentication: the gsasl driver not provides the $authN variables in time
       for the expansion of the server_scram_iter and server_scram_salt options.
 
 WB/01 SPF: DNS lookups for the obsolete SPF RR type done by the libspf2 library
-      are now specifically given a HOST_NOT_FOUND response without hitting the
-      system resolver.  The library goes on to do the now-standard TXT lookup.
+      are now specifically given a NO_DATA response without hitting the system
+      resolver.  The library goes on to do the now-standard TXT lookup.
       Use of dnsdb lookups is not affected.
       
 
diff --git a/src/src/spf.c b/src/src/spf.c
index fd9831c43..f120f722c 100644
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -72,14 +72,13 @@ int dns_rc;
 
 DEBUG(D_receive) debug_printf("SPF_dns_exim_lookup '%s'\n", domain);
 
-/* Shortcircuit SPF RR lookups by returning HOST_NOT_FOUND (shortest code path
-in libspf2).  They were obsoleted by RFC 6686/7208 years ago. see bug #1294
-*/
+/* Shortcircuit SPF RR lookups by returning NO_DATA.  They were obsoleted by
+RFC 6686/7208 years ago. see bug #1294 */
 
 if (rr_type == T_SPF)
   {
-  HDEBUG(D_host_lookup) debug_printf("faking HOST_NOT_FOUND for SPF RR(99) lookup\n");
-  srr.herrno = HOST_NOT_FOUND;
+  HDEBUG(D_host_lookup) debug_printf("faking NO_DATA for SPF RR(99) lookup\n");
+  srr.herrno = NO_DATA;
   SPF_dns_rr_dup(&spfrr, &srr);
   return spfrr;
   }