From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 10 Dec 2010 01:53:55 +0000 (-0700)
Subject: Author: Frank Schmirler <squid@schmirler.de>
X-Git-Tag: SQUID_3_1_10~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83f6518c10cb5df8a11846876351e144ed2fccf2;p=thirdparty%2Fsquid.git

Author: Frank Schmirler <squid@schmirler.de>
Bug 3121: DigestAuth: AuthUser object is locked twice
---

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 46b9c7090a..16a3fec297 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -1092,7 +1092,6 @@ authDigestLogUsername(char *username, AuthDigestUserRequest *auth_user_request)
     /* set the auth_user type */
     digest_user->auth_type = AUTH_BROKEN;
     /* link the request to the user */
-    auth_user_request->authUser(digest_user);
     auth_user_request->user(digest_user);
     digest_user->addRequest (auth_user_request);
     return auth_user_request;
@@ -1375,8 +1374,6 @@ AuthDigestConfig::decode(char const *proxy_auth)
     /*link the request and the user */
     assert(digest_request != NULL);
 
-    digest_request->authUser (digest_user);
-
     digest_request->user(digest_user);
 
     digest_user->addRequest (digest_request);
@@ -1434,14 +1431,6 @@ AuthDigestUserRequest::authUser() const
     return const_cast<AuthUser *>(user());
 }
 
-void
-AuthDigestUserRequest::authUser(AuthUser *aUser)
-{
-    assert(!authUser());
-    user(aUser);
-    user()->lock();
-}
-
 AuthDigestUserRequest::CredentialsState
 AuthDigestUserRequest::credentials() const
 {
diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h
index 02c69773c0..1002e5b7b3 100644
--- a/src/auth/digest/auth_digest.h
+++ b/src/auth/digest/auth_digest.h
@@ -79,7 +79,6 @@ public:
     CredentialsState credentials() const;
     void credentials(CredentialsState);
 
-    void authUser(AuthUser *);
     AuthUser *authUser() const;
 
     char *nonceb64;		/* "dcd98b7102dd2f0e8b11d0f600bfb0c093" */