From: hno <>
Date: Wed, 25 Jan 2006 20:16:11 +0000 (+0000)
Subject: Corrected port of patch for Bug #577. Issue found by Gonzalo Arana
X-Git-Tag: SQUID_3_0_PRE4~341
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ae2408ba8c2bb3e32c575c24646fbe77fc10a9b;p=thirdparty%2Fsquid.git

Corrected port of patch for Bug #577. Issue found by Gonzalo Arana
---

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 7ffd19f448..c7ee5a1859 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.66 2005/09/17 05:50:08 wessels Exp $
+ * $Id: external_acl.cc,v 1.67 2006/01/25 13:16:11 hno Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -1083,14 +1083,10 @@ externalAclHandleReply(void *data, char *reply)
         if (reply)
             entry = external_acl_cache_add(state->def, state->key, entryData);
         else {
-            if (reply)
-                entry = (external_acl_entry *)hash_lookup(state->def->cache, state->key);
-            else {
-                external_acl_entry *oldentry = (external_acl_entry *)hash_lookup(state->def->cache, state->key);
+            external_acl_entry *oldentry = (external_acl_entry *)hash_lookup(state->def->cache, state->key);
 
-                if (oldentry)
-                    external_acl_cache_delete(state->def, oldentry);
-            }
+            if (oldentry)
+                external_acl_cache_delete(state->def, oldentry);
         }
     }