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

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b904aa99cd5188b3bf2b786824b1d1cf70bda3f5..ce225e9492788b5396d03bee2d0f350d57e50aab 100644 (file)
--- 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
       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.
       
 
       Use of dnsdb lookups is not affected.
       
 

diff --git a/src/src/spf.c b/src/src/spf.c
index fd9831c43470ed84ceda9ec271c38fbff81c0ffb..f120f722c81106274966517b09423ca6c920f2e0 100644 (file)
--- 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);
 
 
 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)
   {
 
 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;
   }
   SPF_dns_rr_dup(&spfrr, &srr);
   return spfrr;
   }