From: hno <>
Date: Mon, 17 Sep 2007 15:05:52 +0000 (+0000)
Subject: Reject DNS responses which result in no data
X-Git-Tag: SQUID_3_0_RC1~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6d3dbd4e9fe19f9dccdc07e650c7ca1704de246;p=thirdparty%2Fsquid.git

Reject DNS responses which result in no data
---

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 125327d242..c1e57d517c 100644
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.173 2007/05/29 13:31:39 amosjeffries Exp $
+ * $Id: fqdncache.cc,v 1.174 2007/09/17 09:05:52 hno Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -260,7 +260,7 @@ fqdncacheCallback(fqdncache_entry * f)
 
     if (cbdataReferenceValidDone(f->handlerData, &cbdata)) {
         dns_error_message = f->error_message;
-        callback(f->flags.negcached ? NULL : f->names[0], cbdata);
+        callback(f->name_count ? f->names[0] : NULL, cbdata);
     }
 
     fqdncacheUnlockEntry(f);
diff --git a/src/ipcache.cc b/src/ipcache.cc
index 817de6c9ee..7ff7535020 100644
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.262 2007/08/17 05:01:43 amosjeffries Exp $
+ * $Id: ipcache.cc,v 1.263 2007/09/17 09:05:52 hno Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -268,7 +268,7 @@ ipcacheCallback(ipcache_entry * i)
 
     if (cbdataReferenceValidDone(i->handlerData, &cbdata)) {
         dns_error_message = i->error_message;
-        callback(i->flags.negcached ? NULL : &i->addrs, cbdata);
+        callback(i->addrs.count ? &i->addrs : NULL, cbdata);
     }
 
     ipcacheUnlockEntry(i);