Remove duplicate basic auth authenticatestatedata

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index a5479c7b63c622518696dc8e2bf838fd9fd8d348..df892599034d36a2a3269baf6db337be9198a440 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -39,12 +39,13 @@
 
 #include "squid.h"
 #include "auth/basic/auth_basic.h"
+#include "auth/basic/basicScheme.h"
 #include "auth/basic/basicUserRequest.h"
 #include "auth/Gadgets.h"
+#include "auth/State.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "HttpReply.h"
-#include "auth/basic/basicScheme.h"
 #include "rfc1738.h"
 #include "wordlist.h"
 #include "SquidTime.h"
@@ -141,7 +142,7 @@ BasicUser::~BasicUser()
 static void
 authenticateBasicHandleReply(void *data, char *reply)
 {
-    AuthenticateStateData *r = static_cast<AuthenticateStateData *>(data);
+    authenticateStateData *r = static_cast<authenticateStateData *>(data);
     BasicAuthQueueNode *tmpnode;
     char *t = NULL;
     void *cbdata;
@@ -256,8 +257,6 @@ authenticateBasicStats(StoreEntry * sentry)
     helperStats(sentry, basicauthenticators, "Basic Authenticator Statistics");
 }
 
-CBDATA_TYPE(AuthenticateStateData);
-
 static AuthUser *
 authBasicAuthUserFindUsername(const char *username)
 {
@@ -518,7 +517,7 @@ AuthBasicConfig::init(AuthConfig * schemeCfg)
 
         helperOpenServers(basicauthenticators);
 
-        CBDATA_INIT_TYPE(AuthenticateStateData);
+        CBDATA_INIT_TYPE(authenticateStateData);
     }
 }
 
@@ -550,10 +549,10 @@ BasicUser::submitRequest(AuthUserRequest::Pointer auth_user_request, RH * handle
 {
     /* mark the user as having verification in progress */
     flags.credentials_ok = 2;
-    AuthenticateStateData *r = NULL;
+    authenticateStateData *r = NULL;
     char buf[8192];
     char user[1024], pass[1024];
-    r = cbdataAlloc(AuthenticateStateData);
+    r = cbdataAlloc(authenticateStateData);
     r->handler = handler;
     r->data = cbdataReference(data);
     r->auth_user_request = auth_user_request;

diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index 8c2c33baf35c47f44b5d72ea1788243d9028e53a..c84280e3853eb86a5f9d8bd8962d15010bb44e89 100644 (file)
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -14,19 +14,7 @@
 
 #define DefaultAuthenticateChildrenMax  32     /* 32 processes */
 
-/* Generic */
-
-class AuthenticateStateData
-{
-
-public:
-    void *data;
-    AuthUserRequest::Pointer auth_user_request;
-    RH *handler;
-};
-
-/* queue of auth requests waiting for verification to occur */
-
+/** queue of auth requests waiting for verification to occur */
 class BasicAuthQueueNode
 {