From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 10 Jan 2012 02:40:32 +0000 (-0700)
Subject: Bug 3473: erase last uses of obsolete auth_user_hash_pointer
X-Git-Tag: SQUID_3_1_19~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4af4396035dd03451c0d815f74d71f04577a7a2b;p=thirdparty%2Fsquid.git

Bug 3473: erase last uses of obsolete auth_user_hash_pointer
---

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 2df4dbf9a8..933ad0af66 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -490,10 +490,10 @@ authDigestUserFindUsername(const char *username)
     AuthUser *auth_user;
     debugs(29, 9, HERE << "Looking for user '" << username << "'");
 
-    if (username && (usernamehash = static_cast < auth_user_hash_pointer * >(hash_lookup(proxy_auth_username_cache, username)))) {
+    if (username && (usernamehash = static_cast < AuthUserHashPointer * >(hash_lookup(proxy_auth_username_cache, username)))) {
         while ((usernamehash->user()->auth_type != AUTH_DIGEST) &&
                 (usernamehash->next))
-            usernamehash = static_cast < auth_user_hash_pointer * >(usernamehash->next);
+            usernamehash = static_cast < AuthUserHashPointer * >(usernamehash->next);
 
         auth_user = NULL;
 
@@ -515,7 +515,7 @@ authDigestUserShutdown(void)
     AuthUser *auth_user;
     hash_first(proxy_auth_username_cache);
 
-    while ((usernamehash = ((auth_user_hash_pointer *) hash_next(proxy_auth_username_cache)))) {
+    while ((usernamehash = ((AuthUserHashPointer *) hash_next(proxy_auth_username_cache)))) {
         auth_user = usernamehash->user();
 
         if (strcmp(auth_user->config->type(), "digest") == 0)
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 3fa5b46f78..33408b6d88 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -393,7 +393,7 @@ authenticateNTLMHandleReply(void *data, void *lastserver, char *reply)
         debugs(29, 4, "AuthNTLMUserRequest::authenticate: authenticated user " << ntlm_user->username());
         /* see if this is an existing user with a different proxy_auth
          * string */
-        auth_user_hash_pointer *usernamehash = static_cast<AuthUserHashPointer *>(hash_lookup(proxy_auth_username_cache, ntlm_user->username()));
+        AuthUserHashPointer *usernamehash = static_cast<AuthUserHashPointer *>(hash_lookup(proxy_auth_username_cache, ntlm_user->username()));
         AuthUser *local_auth_user = ntlm_request->user();
         while (usernamehash && (usernamehash->user()->auth_type != AUTH_NTLM || strcmp(usernamehash->user()->username(), ntlm_user->username()) != 0))
             usernamehash = static_cast<AuthUserHashPointer *>(usernamehash->next);
diff --git a/src/typedefs.h b/src/typedefs.h
index 9e204abe91..7e9098f57e 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -49,11 +49,6 @@ typedef struct {
 //UNUSED		typedef struct _acl_deny_info_list acl_deny_info_list;
 //UNUSED		typedef class AuthUser auth_user_t;
 
-
-/// \ingroup AuthAPI
-/// \deprecated Use AuthUserHashPointer instead.
-typedef struct AuthUserHashPointer auth_user_hash_pointer;
-
 /// \ingroup AuthAPI
 /// \deprecated Use AuthUserIP instead.
 typedef struct AuthUserIP auth_user_ip_t;