From: rousskov <>
Date: Fri, 8 Feb 2008 01:16:24 +0000 (+0000)
Subject: Author:  Christos Tsantilas <chtsanti@users.sourceforge.net>
X-Git-Tag: BASIC_TPROXY4~139
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=702c0b9bd835a5839260b055834bba25f844b29d;p=thirdparty%2Fsquid.git

Author:  Christos Tsantilas <chtsanti@users.sourceforge.net>
Bug 2172: When user fails authentification Squid restarts

Replaced an assertion that there is no auth_user_request, a comment what
to do when there is no auth_user_request, and a comment that there can
be no auth_user_request with what the first comment suggested to do.
---

diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc
index 6db3623669..74eaead25d 100644
--- a/src/ACLChecklist.cc
+++ b/src/ACLChecklist.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cc,v 1.43 2007/12/14 23:11:45 amosjeffries Exp $
+ * $Id: ACLChecklist.cc,v 1.44 2008/02/07 18:16:24 rousskov Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -393,13 +393,9 @@ ACLChecklist::~ACLChecklist()
 
     HTTPMSGUNLOCK(reply);
 
-    /*
-     * DPW 2007-05-08
-     * If this fails, then we'll need a backup UNLOCK call in the
-     * destructor.
-     */
-    /* AYJ: It fails in builds without any Authentication configured */
-    assert(auth_user_request == NULL);
+    // no auth_user_request in builds without any Authentication configured
+    if (auth_user_request)
+        AUTHUSERREQUESTUNLOCK(auth_user_request, "ACLChecklist destructor");
 
     conn_ = NULL;