From: wessels <>
Date: Wed, 4 Oct 2000 07:02:13 +0000 (+0000)
Subject: DW:
X-Git-Tag: SQUID_3_0_PRE1~1845
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b65d31c3aac5ae9150fec15c1abdc9562dffe98;p=thirdparty%2Fsquid.git

DW:
 - Got the logic backwards in these callbacks.  Pass NULL if negatively
   cached, rather than NULL for valid entries.
---

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 12cf3f4948..deae7bfb33 100644
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.138 2000/10/03 23:01:31 wessels Exp $
+ * $Id: fqdncache.cc,v 1.139 2000/10/04 01:02:13 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -194,7 +194,7 @@ fqdncacheCallback(fqdncache_entry * f)
     f->handlerData = NULL;
     if (cbdataValid(handlerData)) {
 	dns_error_message = f->error_message;
-	handler(f->flags.negcached ? f->names[0] : NULL, handlerData);
+	handler(f->flags.negcached ? NULL : f->names[0], handlerData);
     }
     cbdataUnlock(handlerData);
     fqdncacheUnlockEntry(f);
diff --git a/src/ipcache.cc b/src/ipcache.cc
index 0272075128..deaac6155a 100644
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.222 2000/10/04 00:24:17 wessels Exp $
+ * $Id: ipcache.cc,v 1.223 2000/10/04 01:02:13 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -204,7 +204,7 @@ ipcacheCallback(ipcache_entry * i)
     i->handlerData = NULL;
     if (cbdataValid(handlerData)) {
 	dns_error_message = i->error_message;
-	handler(i->flags.negcached ? &i->addrs : NULL, handlerData);
+	handler(i->flags.negcached ? NULL : &i->addrs, handlerData);
     }
     cbdataUnlock(i->handlerData);
     ipcacheUnlockEntry(i);