---------------------
PatchSet 11670 
Date: 2007/09/17 20:28:16
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
MFC: Reject DNS responses which result in no data

Members: 
	src/fqdncache.c:1.156->1.156.2.1 
	src/ipcache.c:1.245.2.1->1.245.2.2 

Index: squid/src/fqdncache.c
===================================================================
RCS file: /cvsroot/squid/squid/src/fqdncache.c,v
retrieving revision 1.156
retrieving revision 1.156.2.1
diff -u -r1.156 -r1.156.2.1
--- squid/src/fqdncache.c	30 May 2006 00:56:11 -0000	1.156
+++ squid/src/fqdncache.c	17 Sep 2007 20:28:16 -0000	1.156.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.c,v 1.156 2006/05/30 00:56:11 hno Exp $
+ * $Id: fqdncache.c,v 1.156.2.1 2007/09/17 20:28:16 hno Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -211,7 +211,7 @@
     f->handlerData = NULL;
     if (cbdataValid(handlerData)) {
 	dns_error_message = f->error_message;
-	handler(f->flags.negcached ? NULL : f->names[0], handlerData);
+	handler(f->name_count ? f->names[0] : NULL, handlerData);
     }
     cbdataUnlock(handlerData);
     fqdncacheUnlockEntry(f);
Index: squid/src/ipcache.c
===================================================================
RCS file: /cvsroot/squid/squid/src/ipcache.c,v
retrieving revision 1.245.2.1
retrieving revision 1.245.2.2
diff -u -r1.245.2.1 -r1.245.2.2
--- squid/src/ipcache.c	31 Aug 2007 13:46:25 -0000	1.245.2.1
+++ squid/src/ipcache.c	17 Sep 2007 20:28:16 -0000	1.245.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.c,v 1.245.2.1 2007/08/31 13:46:25 hno Exp $
+ * $Id: ipcache.c,v 1.245.2.2 2007/09/17 20:28:16 hno Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -223,7 +223,7 @@
     i->handlerData = NULL;
     if (cbdataValid(handlerData)) {
 	dns_error_message = i->error_message;
-	handler(i->flags.negcached ? NULL : &i->addrs, handlerData);
+	handler(i->addrs.count ? &i->addrs : NULL, handlerData);
     }
     cbdataUnlock(handlerData);
     ipcacheUnlockEntry(i);