]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
SourceFormat Enforcement
authorAutomatic source maintenance <squidadm@squid-cache.org>
Thu, 3 Jun 2010 00:12:32 +0000 (18:12 -0600)
committerAutomatic source maintenance <squidadm@squid-cache.org>
Thu, 3 Jun 2010 00:12:32 +0000 (18:12 -0600)
src/auth/Acl.cc
src/auth/Config.h
src/auth/Gadgets.h
src/auth/User.cc
src/auth/digest/digestUserRequest.cc
src/auth/negotiate/negotiateUserRequest.cc
src/auth/ntlm/ntlmUserRequest.cc
src/cache_cf.cc
src/protos.h

index 6e43bca198af9181add2a3d9ccbd1ce2686f3919..0974f94a795752e724c6910c407ef98867281625 100644 (file)
@@ -33,8 +33,8 @@ AuthenticateAcl(ACLChecklist *ch)
     /* get authed here */
     /* Note: this fills in auth_user_request when applicable */
     const AuthAclState result = AuthUserRequest::tryToAuthenticateAndSetAuthUser(
-                                  &checklist->auth_user_request, headertype, request,
-                                  checklist->conn(), checklist->src_addr);
+                                    &checklist->auth_user_request, headertype, request,
+                                    checklist->conn(), checklist->src_addr);
     switch (result) {
 
     case AUTH_ACL_CANNOT_AUTHENTICATE:
index 8ea2eca233c39c45f1f330aa9595988525e41a15..26ecdbfe01c4873a09d85286362a803879b379f8 100644 (file)
@@ -129,7 +129,7 @@ public:
     virtual const char * type() const = 0;
 
 public:
-    HelperChildConfig authenticateChildren;    
+    HelperChildConfig authenticateChildren;
     wordlist *authenticate;
 };
 
index 11de64c42c0c0bf43c017e888d308d2657cdb84f..7f140b2a2f2cd4926100b1996959e2a8d36adb9c 100644 (file)
@@ -52,7 +52,8 @@ class AuthUser;
  * is recorded in the cache. Any caller using hash_remove_link
  * must then delete the AuthUserHashPointer.
  */
-class AuthUserHashPointer : public hash_link {
+class AuthUserHashPointer : public hash_link
+{
     /* first two items must be same as hash_link */
 
 public:
index 1dc586902b957c5306a2835294775e1e7b8322a4..31e11c36348c2924d3f4ef9330e043c5ce63f5e3 100644 (file)
@@ -61,7 +61,7 @@ AuthUser::AuthUser(AuthConfig *aConfig) :
         config(aConfig),
         ipcount(0),
         expiretime(0),
-       credentials_state(Unchecked),
+        credentials_state(Unchecked),
         username_(NULL)
 {
     proxy_auth_list.head = proxy_auth_list.tail = NULL;
@@ -390,6 +390,6 @@ AuthUser::UsernameCacheStats(StoreEntry *output)
                           auth_user->ttl(),
                           static_cast<int32_t>(auth_user->expiretime - squid_curtime + Config.authenticateTTL),
                           auth_user->username()
-                          );
+                         );
     }
 }
index f51b7ea96416c5b388f67bf83396d07dd5cee566..0816f98743eaaa637f33ac6700b354f6914c3db9 100644 (file)
@@ -101,7 +101,7 @@ AuthDigestUserRequest::authenticate(HttpRequest * request, ConnStateData * conn,
             return;
         }
 
-       if (static_cast<AuthDigestConfig*>(AuthConfig::Find("digest"))->PostWorkaround && request->method != METHOD_GET) {
+        if (static_cast<AuthDigestConfig*>(AuthConfig::Find("digest"))->PostWorkaround && request->method != METHOD_GET) {
             /* Ugly workaround for certain very broken browsers using the
              * wrong method to calculate the request-digest on POST request.
              * This should be deleted once Digest authentication becomes more
index e9e08632de28bac1de4245d06dfa71c0757eb0da..7127798d35ee4e99a927a14d8c244d82b2af756b 100644 (file)
@@ -256,7 +256,7 @@ AuthNegotiateUserRequest::authenticate(HttpRequest * aRequest, ConnStateData * c
         /* we've failed somewhere in authentication */
         debugs(29, 9, HERE << "auth state negotiate failed. " << proxy_auth);
         break;
-   }
+    }
 
     return;
 }
@@ -277,7 +277,7 @@ AuthNegotiateUserRequest::HandleReply(void *data, void *lastserver, char *reply)
         cbdataReferenceDone(r->data);
         authenticateStateFree(r);
         return;
-   }
+    }
 
     if (!reply) {
         debugs(29, DBG_IMPORTANT, "ERROR: Negotiate Authentication Helper '" << lastserver << "' crashed!.");
index cf0776b8da30e6cd70b5b77c0af8cdf1790c0cbf..6182426c65d683849aea4613ce45c25d9c62517e 100644 (file)
@@ -82,7 +82,7 @@ AuthNTLMUserRequest::module_start(RH * handler, void *data)
     if (static_cast<AuthNTLMConfig*>(AuthConfig::Find("ntlm"))->authenticate == NULL) {
         debugs(29, DBG_CRITICAL, "ERROR: NTLM Start: no NTLM program configured.");
         handler(data, NULL);
-       return;
+        return;
     }
 
     r = cbdataAlloc(authenticateStateData);
index 1bb1ea226cce595d130fa784259e54e2f95a8ce6..113c5df4c2f5cc4628cbd1a4a3cc3db6635b36d1 100644 (file)
@@ -1484,7 +1484,7 @@ free_authparam(Auth::authConfig * cfg)
     }
 
     /* on reconfigure initialize new auth schemes for the new config. */
-    if(reconfiguring) {
+    if (reconfiguring) {
         InitAuthSchemes();
     }
 }
index 23c2c0d68399f67e9ab2e2e2bb5708bea11c6348..1e216621d9a91c7ebf3a473ea2261cac849b64d7 100644 (file)
@@ -790,7 +790,7 @@ class external_acl;
             SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
 #endif
 
-/* call to ensure the auth component schemes exist. */
-SQUIDCEXTERN void InitAuthSchemes(void);
+            /* call to ensure the auth component schemes exist. */
+            SQUIDCEXTERN void InitAuthSchemes(void);
 
 #endif /* SQUID_PROTOS_H */