From: Francesco Chemolli Date: Mon, 10 Feb 2014 12:37:47 +0000 (+0100) Subject: Fix argument name conflict in Auth::Config::findUserInCache X-Git-Tag: SQUID_3_5_0_1~378 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c60f60fc70b95cf170a61f3b9d5b717a92fc5d2;p=thirdparty%2Fsquid.git Fix argument name conflict in Auth::Config::findUserInCache --- diff --git a/src/auth/Config.cc b/src/auth/Config.cc index e4430800e1..a50c13b308 100644 --- a/src/auth/Config.cc +++ b/src/auth/Config.cc @@ -132,14 +132,14 @@ Auth::Config::done() } Auth::User::Pointer -Auth::Config::findUserInCache(const char *nameKey, Auth::Type type) +Auth::Config::findUserInCache(const char *nameKey, Auth::Type authType) { AuthUserHashPointer *usernamehash; debugs(29, 9, "Looking for user '" << nameKey << "'"); if (nameKey && (usernamehash = static_cast(hash_lookup(proxy_auth_username_cache, nameKey)))) { while (usernamehash) { - if ((usernamehash->user()->auth_type == type) && + if ((usernamehash->user()->auth_type == authType) && !strcmp(nameKey, (char const *)usernamehash->key)) return usernamehash->user();