From: Amos Jeffries Date: Fri, 25 Sep 2015 10:49:01 +0000 (-0700) Subject: Run source maintenance script X-Git-Tag: SQUID_4_0_1~21^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fde785eeec082988e3669c41bf19534119bf3c3c;p=thirdparty%2Fsquid.git Run source maintenance script --- diff --git a/src/auth/CredentialsCache.h b/src/auth/CredentialsCache.h index b310839ae7..e7f392f692 100644 --- a/src/auth/CredentialsCache.h +++ b/src/auth/CredentialsCache.h @@ -33,7 +33,6 @@ public: CredentialsCache(const CredentialsCache&) = delete; CredentialsCache& operator=(const CredentialsCache&) = delete; - /// obtain pointer to user if present, or Pointer(nullptr) if not /// \returns a pointer to cached credentials, or nil if none found Auth::User::Pointer lookup(const SBuf &userKey) const; @@ -43,7 +42,7 @@ public: /// clear cache void reset() { store_.clear(); } - /// extract number of cached usernames + /// \returns number of cached usernames size_t size() const { return store_.size(); } /** periodic cleanup function, removes timed-out entries @@ -62,7 +61,7 @@ public: */ void doConfigChangeCleanup(); - /// obtain alphanumerically sorted list of usernames + /// \returns alphanumerically sorted list of usernames std::vector sortedUsersList() const; private: diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc index 857676eb10..4c23e16029 100644 --- a/src/auth/Gadgets.cc +++ b/src/auth/Gadgets.cc @@ -18,13 +18,13 @@ #include "auth/AclProxyAuth.h" #include "auth/basic/User.h" #include "auth/Config.h" +#include "auth/CredentialsCache.h" #include "auth/digest/User.h" #include "auth/Gadgets.h" #include "auth/negotiate/User.h" #include "auth/ntlm/User.h" #include "auth/Scheme.h" #include "auth/User.h" -#include "auth/CredentialsCache.h" #include "auth/UserRequest.h" #include "client_side.h" #include "globals.h" diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index 68c39c6200..5c2c797487 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -21,6 +21,8 @@ libauth_la_SOURCES = \ Type.cc \ Config.cc \ Config.h \ + CredentialsCache.h \ + CredentialsCache.cc \ CredentialState.cc \ CredentialState.h \ Gadgets.cc \ @@ -32,8 +34,6 @@ libauth_la_SOURCES = \ State.cc \ User.h \ User.cc \ - CredentialsCache.h \ - CredentialsCache.cc \ UserRequest.h \ UserRequest.cc diff --git a/src/auth/User.cc b/src/auth/User.cc index b7a0606ee1..b92692459b 100644 --- a/src/auth/User.cc +++ b/src/auth/User.cc @@ -12,9 +12,9 @@ #include "acl/Acl.h" #include "acl/Gadgets.h" #include "auth/Config.h" +#include "auth/CredentialsCache.h" #include "auth/Gadgets.h" #include "auth/User.h" -#include "auth/CredentialsCache.h" #include "auth/UserRequest.h" #include "event.h" #include "globals.h" diff --git a/src/auth/basic/Config.cc b/src/auth/basic/Config.cc index d62e093fc6..09b7e8ba95 100644 --- a/src/auth/basic/Config.cc +++ b/src/auth/basic/Config.cc @@ -17,9 +17,9 @@ #include "auth/basic/Scheme.h" #include "auth/basic/User.h" #include "auth/basic/UserRequest.h" +#include "auth/CredentialsCache.h" #include "auth/Gadgets.h" #include "auth/State.h" -#include "auth/CredentialsCache.h" #include "cache_cf.h" #include "charset.h" #include "helper.h" diff --git a/src/auth/digest/Config.cc b/src/auth/digest/Config.cc index eea2f30d3d..d5d88a28d9 100644 --- a/src/auth/digest/Config.cc +++ b/src/auth/digest/Config.cc @@ -13,13 +13,13 @@ * See acl.c for access control and client_side.c for auditing */ #include "squid.h" +#include "auth/CredentialsCache.h" #include "auth/digest/Config.h" #include "auth/digest/Scheme.h" #include "auth/digest/User.h" #include "auth/digest/UserRequest.h" #include "auth/Gadgets.h" #include "auth/State.h" -#include "auth/CredentialsCache.h" #include "base/LookupTable.h" #include "base64.h" #include "cache_cf.h" diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc index a9e6f53cf1..86787d6df1 100644 --- a/src/auth/digest/User.cc +++ b/src/auth/digest/User.cc @@ -7,9 +7,9 @@ */ #include "squid.h" +#include "auth/CredentialsCache.h" #include "auth/digest/Config.h" #include "auth/digest/User.h" -#include "auth/CredentialsCache.h" #include "Debug.h" #include "dlink.h" #include "SquidConfig.h" diff --git a/src/auth/negotiate/User.cc b/src/auth/negotiate/User.cc index fa07371236..0c38696d50 100644 --- a/src/auth/negotiate/User.cc +++ b/src/auth/negotiate/User.cc @@ -8,8 +8,8 @@ #include "squid.h" #include "auth/Config.h" -#include "auth/negotiate/User.h" #include "auth/CredentialsCache.h" +#include "auth/negotiate/User.h" #include "Debug.h" Auth::Negotiate::User::User(Auth::Config *aConfig, const char *aRequestRealm) : diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc index 165d970a7f..f68b1acf20 100644 --- a/src/auth/negotiate/UserRequest.cc +++ b/src/auth/negotiate/UserRequest.cc @@ -8,12 +8,12 @@ #include "squid.h" #include "AccessLogEntry.h" +#include "auth/CredentialsCache.h" #include "auth/negotiate/Config.h" #include "auth/negotiate/User.h" #include "auth/negotiate/UserRequest.h" #include "auth/State.h" #include "auth/User.h" -#include "auth/CredentialsCache.h" #include "client_side.h" #include "fatal.h" #include "format/Format.h" diff --git a/src/auth/ntlm/User.cc b/src/auth/ntlm/User.cc index d006f6243e..797d5cb69b 100644 --- a/src/auth/ntlm/User.cc +++ b/src/auth/ntlm/User.cc @@ -8,8 +8,8 @@ #include "squid.h" #include "auth/Config.h" -#include "auth/ntlm/User.h" #include "auth/CredentialsCache.h" +#include "auth/ntlm/User.h" #include "Debug.h" Auth::Ntlm::User::User(Auth::Config *aConfig, const char *aRequestRealm) : diff --git a/src/auth/ntlm/UserRequest.cc b/src/auth/ntlm/UserRequest.cc index cf732da6ea..56ff8fb8ce 100644 --- a/src/auth/ntlm/UserRequest.cc +++ b/src/auth/ntlm/UserRequest.cc @@ -8,11 +8,11 @@ #include "squid.h" #include "AccessLogEntry.h" +#include "auth/CredentialsCache.h" #include "auth/ntlm/Config.h" #include "auth/ntlm/User.h" #include "auth/ntlm/UserRequest.h" #include "auth/State.h" -#include "auth/CredentialsCache.h" #include "cbdata.h" #include "client_side.h" #include "fatal.h"