From: wessels <>
Date: Tue, 30 Dec 1997 09:46:35 +0000 (+0000)
Subject: Fix for proxy auth username/passwd bug from BoB Miorelli.
X-Git-Tag: SQUID_3_0_PRE1~4343
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51eee77631ad793ac5984e9aed67c3d5cbf550f2;p=thirdparty%2Fsquid.git

Fix for proxy auth username/passwd bug from BoB Miorelli.
gindent
---

diff --git a/src/acl.cc b/src/acl.cc
index 17036a0325..2df2e5c66b 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.123 1997/12/27 18:15:08 kostas Exp $
+ * $Id: acl.cc,v 1.124 1997/12/30 02:46:35 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -1376,11 +1376,13 @@ aclCheck(aclCheck_t * checklist)
 		checklist);
 	    return;
 	}
+	if (checklist->state[ACL_PROXY_AUTH] == ACL_LOOKUP_NEEDED) {
+	    allow = ACCESS_REQ_PROXY_AUTH;
+	    debug(28, 3) ("aclCheck: match pending, returning %d\n", allow);
+	    aclCheckCallback(checklist, allow);
+	    return;
+	}
 	if (match) {
-	    /* hack! */
-	    if (allow == ACCESS_DENIED)
-		if (checklist->state[ACL_PROXY_AUTH] == ACL_LOOKUP_NEEDED)
-		    allow = ACCESS_REQ_PROXY_AUTH;
 	    debug(28, 3) ("aclCheck: match found, returning %d\n", allow);
 	    aclCheckCallback(checklist, allow);
 	    return;