From: wessels <>
Date: Wed, 9 May 2007 13:36:24 +0000 (+0000)
Subject: Removed auth_user_request_t typedef.  Just use AuthUserRequest.
X-Git-Tag: SQUID_3_0_PRE6~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76f142cd6be66626c6555e065e4c0a75bb772b8d;p=thirdparty%2Fsquid.git

Removed auth_user_request_t typedef.  Just use AuthUserRequest.
---

diff --git a/src/ACLChecklist.h b/src/ACLChecklist.h
index 671b7cf95d..6228e03cc6 100644
--- a/src/ACLChecklist.h
+++ b/src/ACLChecklist.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLChecklist.h,v 1.23 2006/05/16 05:49:44 hno Exp $
+ * $Id: ACLChecklist.h,v 1.24 2007/05/09 07:36:24 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -127,7 +127,7 @@ class NullState : public AsyncState
     /* for acls that look at reply data */
     HttpReply *reply;
     char rfc931[USER_IDENT_SZ];
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
 #if SQUID_SNMP
 
     char *snmp_community;
diff --git a/src/ACLMaxUserIP.cc b/src/ACLMaxUserIP.cc
index 58b5340b2e..b5fac9baa6 100644
--- a/src/ACLMaxUserIP.cc
+++ b/src/ACLMaxUserIP.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMaxUserIP.cc,v 1.13 2007/04/30 16:56:09 wessels Exp $
+ * $Id: ACLMaxUserIP.cc,v 1.14 2007/05/09 07:36:24 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -115,7 +115,7 @@ ACLMaxUserIP::parse()
  * 1 : Match 
  */
 int
-ACLMaxUserIP::match(auth_user_request_t * auth_user_request,
+ACLMaxUserIP::match(AuthUserRequest * auth_user_request,
 
                     struct IN_ADDR const &src_addr)
 {
diff --git a/src/ACLMaxUserIP.h b/src/ACLMaxUserIP.h
index a797c63f78..3a4b8d6db2 100644
--- a/src/ACLMaxUserIP.h
+++ b/src/ACLMaxUserIP.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLMaxUserIP.h,v 1.8 2006/04/23 11:10:31 robertc Exp $
+ * $Id: ACLMaxUserIP.h,v 1.9 2007/05/09 07:36:24 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -66,7 +66,7 @@ private:
     static Prototype RegistryProtoype;
     static ACLMaxUserIP RegistryEntry_;
 
-    int match(auth_user_request_t *, struct IN_ADDR const &);
+    int match(AuthUserRequest *, struct IN_ADDR const &);
     char const *class_;
     int maximum;
 
diff --git a/src/ACLProxyAuth.cc b/src/ACLProxyAuth.cc
index 8a18842a63..4f7f1d54ad 100644
--- a/src/ACLProxyAuth.cc
+++ b/src/ACLProxyAuth.cc
@@ -138,7 +138,7 @@ ProxyAuthLookup::checkForAsync(ACLChecklist *checklist)const
     checklist->asyncInProgress(true);
     debugs(28, 3, "ACLChecklist::checkForAsync: checking password via authenticator");
 
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     /* make sure someone created auth_user_request for us */
     assert(checklist->auth_user_request != NULL);
     auth_user_request = checklist->auth_user_request;
diff --git a/src/AuthConfig.h b/src/AuthConfig.h
index 9e75c3a3c7..ed5b427aad 100644
--- a/src/AuthConfig.h
+++ b/src/AuthConfig.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: AuthConfig.h,v 1.2 2006/05/29 00:14:59 robertc Exp $
+ * $Id: AuthConfig.h,v 1.3 2007/05/09 07:36:24 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -71,7 +71,7 @@ public:
     /* output the parameters */
     virtual void dump(StoreEntry *, const char *, AuthConfig *) = 0;
     /* add headers as needed when challenging for auth */
-    virtual void fixHeader(auth_user_request_t *, HttpReply *, http_hdr_type, HttpRequest *) = 0;
+    virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *) = 0;
     /* prepare to handle requests */
     virtual void init(AuthConfig *) = 0;
     /* expose any/all statistics to a CacheManager */
diff --git a/src/AuthUser.cc b/src/AuthUser.cc
index 172ac828fa..c266ee7c13 100644
--- a/src/AuthUser.cc
+++ b/src/AuthUser.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: AuthUser.cc,v 1.5 2007/04/30 16:56:09 wessels Exp $
+ * $Id: AuthUser.cc,v 1.6 2007/05/09 07:36:24 wessels Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR:  Robert Collins
@@ -70,7 +70,7 @@ AuthUser::AuthUser (AuthConfig *aConfig) :
 void
 AuthUser::absorb (AuthUser *from)
 {
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     /*
      * XXX combine two authuser structs. Incomplete: it should merge
      * in hash references too and ask the module to merge in scheme
@@ -80,7 +80,7 @@ AuthUser::absorb (AuthUser *from)
     dlink_node *link = from->requests.head;
 
     while (link) {
-        auth_user_request = static_cast<auth_user_request_t *>(link->data);
+        auth_user_request = static_cast<AuthUserRequest *>(link->data);
         dlink_node *tmplink = link;
         link = link->next;
         dlinkDelete(tmplink, &from->requests);
@@ -95,7 +95,7 @@ AuthUser::absorb (AuthUser *from)
 
 AuthUser::~AuthUser()
 {
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     dlink_node *link, *tmplink;
     debugs(29, 5, "AuthUser::~AuthUser: Freeing auth_user '" << this << "' with refcount '" << references << "'.");
     assert(references == 0);
@@ -116,7 +116,7 @@ AuthUser::~AuthUser()
 
     while (link) {
         debugs(29, 5, "AuthUser::~AuthUser: removing request entry '" << link->data << "'");
-        auth_user_request = static_cast<auth_user_request_t *>(link->data);
+        auth_user_request = static_cast<AuthUserRequest *>(link->data);
         tmplink = link;
         link = link->next;
         dlinkDelete(tmplink, &requests);
diff --git a/src/AuthUserRequest.cc b/src/AuthUserRequest.cc
index 16e5f6c5fc..299d6e6eff 100644
--- a/src/AuthUserRequest.cc
+++ b/src/AuthUserRequest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: AuthUserRequest.cc,v 1.14 2007/04/30 16:56:09 wessels Exp $
+ * $Id: AuthUserRequest.cc,v 1.15 2007/05/09 07:36:24 wessels Exp $
  *
  * DO NOT MODIFY NEXT 2 LINES:
  * arch-tag: 6803fde1-d5a2-4c29-9034-1c0c9f650eb4
@@ -70,7 +70,7 @@ AuthUserRequest::username() const
 }
 
 size_t
-authenticateRequestRefCount (auth_user_request_t *aRequest)
+authenticateRequestRefCount (AuthUserRequest *aRequest)
 {
     return aRequest->refCount();
 }
@@ -92,7 +92,7 @@ AuthUserRequest::start(RH * handler, void *data)
  */
 
 int
-authenticateValidateUser(auth_user_request_t * auth_user_request)
+authenticateValidateUser(AuthUserRequest * auth_user_request)
 {
     debugs(29, 9, "authenticateValidateUser: Validating Auth_user request '" << auth_user_request << "'.");
 
@@ -200,7 +200,7 @@ AuthUserRequest::denyMessage(char const * const default_message)
 }
 
 static void
-authenticateAuthUserRequestSetIp(auth_user_request_t * auth_user_request, struct IN_ADDR ipaddr)
+authenticateAuthUserRequestSetIp(AuthUserRequest * auth_user_request, struct IN_ADDR ipaddr)
 {
     auth_user_t *auth_user = auth_user_request->user();
 
@@ -211,7 +211,7 @@ authenticateAuthUserRequestSetIp(auth_user_request_t * auth_user_request, struct
 }
 
 void
-authenticateAuthUserRequestRemoveIp(auth_user_request_t * auth_user_request, struct IN_ADDR ipaddr)
+authenticateAuthUserRequestRemoveIp(AuthUserRequest * auth_user_request, struct IN_ADDR ipaddr)
 {
     auth_user_t *auth_user = auth_user_request->user();
 
@@ -222,14 +222,14 @@ authenticateAuthUserRequestRemoveIp(auth_user_request_t * auth_user_request, str
 }
 
 void
-authenticateAuthUserRequestClearIp(auth_user_request_t * auth_user_request)
+authenticateAuthUserRequestClearIp(AuthUserRequest * auth_user_request)
 {
     if (auth_user_request)
         auth_user_request->user()->clearIp();
 }
 
 int
-authenticateAuthUserRequestIPCount(auth_user_request_t * auth_user_request)
+authenticateAuthUserRequestIPCount(AuthUserRequest * auth_user_request)
 {
     assert(auth_user_request);
     assert(auth_user_request->user());
@@ -241,7 +241,7 @@ authenticateAuthUserRequestIPCount(auth_user_request_t * auth_user_request)
  * authenticateUserAuthenticated: is this auth_user structure logged in ?
  */
 int
-authenticateUserAuthenticated(auth_user_request_t * auth_user_request)
+authenticateUserAuthenticated(AuthUserRequest * auth_user_request)
 {
     if (!authenticateValidateUser(auth_user_request))
         return 0;
@@ -286,15 +286,15 @@ AuthUserRequest::connLastHeader()
  * This is basically a handle approach.
  */
 static void
-authenticateAuthenticateUser(auth_user_request_t * auth_user_request, HttpRequest * request, ConnStateData::Pointer &conn, http_hdr_type type)
+authenticateAuthenticateUser(AuthUserRequest * auth_user_request, HttpRequest * request, ConnStateData::Pointer &conn, http_hdr_type type)
 {
     assert(auth_user_request != NULL);
 
     auth_user_request->authenticate(request, conn, type);
 }
 
-static auth_user_request_t *
-authTryGetUser (auth_user_request_t **auth_user_request, ConnStateData::Pointer & conn, HttpRequest * request)
+static AuthUserRequest *
+authTryGetUser (AuthUserRequest **auth_user_request, ConnStateData::Pointer & conn, HttpRequest * request)
 {
     if (*auth_user_request)
         return *auth_user_request;
@@ -327,7 +327,7 @@ authTryGetUser (auth_user_request_t **auth_user_request, ConnStateData::Pointer
  */
 auth_acl_t
 
-AuthUserRequest::authenticate(auth_user_request_t ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct IN_ADDR src_addr)
+AuthUserRequest::authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct IN_ADDR src_addr)
 {
     const char *proxy_auth;
     assert(headertype != 0);
@@ -562,10 +562,10 @@ AuthUserRequest::authenticate(auth_user_request_t ** auth_user_request, http_hdr
 
 auth_acl_t
 
-AuthUserRequest::tryToAuthenticateAndSetAuthUser(auth_user_request_t ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct IN_ADDR src_addr)
+AuthUserRequest::tryToAuthenticateAndSetAuthUser(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct IN_ADDR src_addr)
 {
     /* If we have already been called, return the cached value */
-    auth_user_request_t *t = authTryGetUser (auth_user_request, conn, request);
+    AuthUserRequest *t = authTryGetUser (auth_user_request, conn, request);
 
     if (t && t->lastReply != AUTH_ACL_CANNOT_AUTHENTICATE
             && t->lastReply != AUTH_ACL_HELPER)
@@ -599,7 +599,7 @@ AuthUserRequest::tryToAuthenticateAndSetAuthUser(auth_user_request_t ** auth_use
  * -2: authenticate broken in some fashion
  */
 int
-authenticateDirection(auth_user_request_t * auth_user_request)
+authenticateDirection(AuthUserRequest * auth_user_request)
 {
     if (!auth_user_request)
         return -2;
@@ -608,7 +608,7 @@ authenticateDirection(auth_user_request_t * auth_user_request)
 }
 
 void
-AuthUserRequest::addReplyAuthHeader(HttpReply * rep, auth_user_request_t * auth_user_request, HttpRequest * request, int accelerated, int internal)
+AuthUserRequest::addReplyAuthHeader(HttpReply * rep, AuthUserRequest * auth_user_request, HttpRequest * request, int accelerated, int internal)
 /* send the auth types we are configured to support (and have compiled in!) */
 {
     http_hdr_type type;
@@ -672,7 +672,7 @@ AuthUserRequest::addReplyAuthHeader(HttpReply * rep, auth_user_request_t * auth_
 }
 
 void
-authenticateFixHeader(HttpReply * rep, auth_user_request_t * auth_user_request, HttpRequest * request, int accelerated, int internal)
+authenticateFixHeader(HttpReply * rep, AuthUserRequest * auth_user_request, HttpRequest * request, int accelerated, int internal)
 {
     AuthUserRequest::addReplyAuthHeader(rep, auth_user_request, request, accelerated, internal);
 }
@@ -680,7 +680,7 @@ authenticateFixHeader(HttpReply * rep, auth_user_request_t * auth_user_request,
 
 /* call the active auth module and allow it to add a trailer to the request */
 void
-authenticateAddTrailer(HttpReply * rep, auth_user_request_t * auth_user_request, HttpRequest * request, int accelerated)
+authenticateAddTrailer(HttpReply * rep, AuthUserRequest * auth_user_request, HttpRequest * request, int accelerated)
 {
     if (auth_user_request != NULL)
         auth_user_request->addTrailer(rep, accelerated);
diff --git a/src/AuthUserRequest.h b/src/AuthUserRequest.h
index a075def8a9..1a3be46155 100644
--- a/src/AuthUserRequest.h
+++ b/src/AuthUserRequest.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: AuthUserRequest.h,v 1.4 2005/10/23 11:55:31 hno Exp $
+ * $Id: AuthUserRequest.h,v 1.5 2007/05/09 07:36:24 wessels Exp $
  *
  * DO NOT MODIFY NEXT 2 LINES:
  * arch-tag: 674533af-8b21-4641-b71a-74c4639072a0
@@ -78,8 +78,8 @@ public:
 
     virtual void user (AuthUser *aUser) {_auth_user=aUser;}
 
-    static auth_acl_t tryToAuthenticateAndSetAuthUser(auth_user_request_t **, http_hdr_type, HttpRequest *, ConnStateData::Pointer, struct IN_ADDR);
-    static void addReplyAuthHeader(HttpReply * rep, auth_user_request_t * auth_user_request, HttpRequest * request, int accelerated, int internal);
+    static auth_acl_t tryToAuthenticateAndSetAuthUser(AuthUserRequest **, http_hdr_type, HttpRequest *, ConnStateData::Pointer, struct IN_ADDR);
+    static void addReplyAuthHeader(HttpReply * rep, AuthUserRequest * auth_user_request, HttpRequest * request, int accelerated, int internal);
 
     AuthUserRequest();
 
@@ -108,7 +108,7 @@ public:
 
 private:
 
-    static auth_acl_t authenticate(auth_user_request_t ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct IN_ADDR src_addr);
+    static auth_acl_t authenticate(AuthUserRequest ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct IN_ADDR src_addr);
 
     /* return a message on the 407 error pages */
     char *message;
@@ -124,17 +124,17 @@ private:
 };
 
 /* AuthUserRequest */
-extern size_t authenticateRequestRefCount (auth_user_request_t *);
+extern size_t authenticateRequestRefCount (AuthUserRequest *);
 
-extern void authenticateFixHeader(HttpReply *, auth_user_request_t *, HttpRequest *, int, int);
-extern void authenticateAddTrailer(HttpReply *, auth_user_request_t *, HttpRequest *, int);
+extern void authenticateFixHeader(HttpReply *, AuthUserRequest *, HttpRequest *, int, int);
+extern void authenticateAddTrailer(HttpReply *, AuthUserRequest *, HttpRequest *, int);
 
-extern void authenticateAuthUserRequestRemoveIp(auth_user_request_t *, struct IN_ADDR);
-extern void authenticateAuthUserRequestClearIp(auth_user_request_t *);
-extern int authenticateAuthUserRequestIPCount(auth_user_request_t *);
-extern int authenticateDirection(auth_user_request_t *);
+extern void authenticateAuthUserRequestRemoveIp(AuthUserRequest *, struct IN_ADDR);
+extern void authenticateAuthUserRequestClearIp(AuthUserRequest *);
+extern int authenticateAuthUserRequestIPCount(AuthUserRequest *);
+extern int authenticateDirection(AuthUserRequest *);
 
-extern int authenticateUserAuthenticated(auth_user_request_t *);
-extern int authenticateValidateUser(auth_user_request_t *);
+extern int authenticateUserAuthenticated(AuthUserRequest *);
+extern int authenticateValidateUser(AuthUserRequest *);
 
 #endif /* SQUID_AUTHUSERREQUEST_H */
diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 7f6f338127..dd9c75b791 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpRequest.h,v 1.26 2007/04/16 17:43:27 rousskov Exp $
+ * $Id: HttpRequest.h,v 1.27 2007/05/09 07:36:24 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -80,7 +80,7 @@ public:
 
     char host[SQUIDHOSTNAMELEN + 1];
 
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
 
     u_short port;
 
diff --git a/src/ICAP/ICAPModXact.cc b/src/ICAP/ICAPModXact.cc
index 0c3ce55c43..e2c7260d4f 100644
--- a/src/ICAP/ICAPModXact.cc
+++ b/src/ICAP/ICAPModXact.cc
@@ -1053,7 +1053,7 @@ void ICAPModXact::makeRequestHeaders(MemBuf &buf)
 }
 
 void ICAPModXact::makeUsernameHeader(const HttpRequest *request, MemBuf &buf) {
-    if (const auth_user_request_t *auth = request->auth_user_request) {
+    if (const AuthUserRequest *auth = request->auth_user_request) {
         if (char const *name = auth->username()) {
             const char *value = TheICAPConfig.client_username_encode ?
                 base64_encode(name) : name;
diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 790ede601d..a4dc7bf004 100644
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: auth_basic.cc,v 1.47 2007/05/07 18:38:40 wessels Exp $
+ * $Id: auth_basic.cc,v 1.48 2007/05/09 07:36:26 wessels Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Duane Wessels
@@ -211,7 +211,7 @@ AuthBasicUserRequest::module_direction()
 }
 
 void
-AuthBasicConfig::fixHeader(auth_user_request_t *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request)
+AuthBasicConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request)
 {
     if (authenticate) {
         debugs(29, 9, "authenticateFixErrorHeader: Sending type:" << type << " header: 'Basic realm=\"" << basicAuthRealm << "\"'");
@@ -615,7 +615,7 @@ AuthBasicConfig::registerWithCacheManager(CacheManager & manager)
 }
 
 void
-BasicUser::queueRequest(auth_user_request_t * auth_user_request, RH * handler, void *data)
+BasicUser::queueRequest(AuthUserRequest * auth_user_request, RH * handler, void *data)
 {
     BasicAuthQueueNode *node;
     node = static_cast<BasicAuthQueueNode *>(xmalloc(sizeof(BasicAuthQueueNode)));
@@ -653,7 +653,7 @@ AuthBasicUserRequest::module_start(RH * handler, void *data)
 }
 
 void
-BasicUser::submitRequest (auth_user_request_t * auth_user_request, RH * handler, void *data)
+BasicUser::submitRequest (AuthUserRequest * auth_user_request, RH * handler, void *data)
 {
     /* mark the user as haveing verification in progress */
     flags.credentials_ok = 2;
diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index e615186874..2664f98ad9 100644
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -20,7 +20,7 @@ class AuthenticateStateData
 
 public:
     void *data;
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     RH *handler;
 };
 
@@ -48,8 +48,8 @@ public:
     BasicUser(AuthConfig *);
     ~BasicUser();
     bool authenticated() const;
-    void queueRequest(auth_user_request_t * auth_user_request, RH * handler, void *data);
-    void submitRequest (auth_user_request_t * auth_user_request, RH * handler, void *data);
+    void queueRequest(AuthUserRequest * auth_user_request, RH * handler, void *data);
+    void submitRequest (AuthUserRequest * auth_user_request, RH * handler, void *data);
     void decode(char const *credentials, AuthUserRequest *);
     char *getCleartext() {return cleartext;}
 
@@ -122,7 +122,7 @@ public:
     virtual AuthUserRequest *decode(char const *proxy_auth);
     virtual void done();
     virtual void dump(StoreEntry *, const char *, AuthConfig *);
-    virtual void fixHeader(auth_user_request_t *, HttpReply *, http_hdr_type, HttpRequest *);
+    virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *);
     virtual void init(AuthConfig *);
     virtual void parse(AuthConfig *, int, char *);
     virtual void registerWithCacheManager(CacheManager & manager);
diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 27ef3721cf..06a29fb22c 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_digest.cc,v 1.53 2007/05/07 18:38:40 wessels Exp $
+ * $Id: auth_digest.cc,v 1.54 2007/05/09 07:36:28 wessels Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Robert Collins
@@ -776,7 +776,7 @@ AuthDigestUserRequest::addTrailer(HttpReply * rep, int accel)
 
 /* add the [www-|Proxy-]authenticate header on a 407 or 401 reply */
 void
-AuthDigestConfig::fixHeader(auth_user_request_t *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request)
+AuthDigestConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request)
 {
     if (!authenticate)
         return;
@@ -823,7 +823,7 @@ static void
 authenticateDigestHandleReply(void *data, char *reply)
 {
     DigestAuthenticateStateData *replyData = static_cast < DigestAuthenticateStateData * >(data);
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     AuthDigestUserRequest *digest_request;
     digest_user_h *digest_user;
     char *t = NULL;
diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h
index 8891502ed7..302ef9ec80 100644
--- a/src/auth/digest/auth_digest.h
+++ b/src/auth/digest/auth_digest.h
@@ -19,7 +19,7 @@ class DigestAuthenticateStateData
 
 public:
     void *data;
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     RH *handler;
 };
 
@@ -164,7 +164,7 @@ public:
     virtual AuthUserRequest *decode(char const *proxy_auth);
     virtual void done();
     virtual void dump(StoreEntry *, const char *, AuthConfig *);
-    virtual void fixHeader(auth_user_request_t *, HttpReply *, http_hdr_type, HttpRequest *);
+    virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *);
     virtual void init(AuthConfig *);
     virtual void parse(AuthConfig *, int, char *);
     virtual void registerWithCacheManager(CacheManager & manager);
diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index df59e6a599..064858b1bd 100644
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_negotiate.cc,v 1.15 2007/05/07 18:38:41 wessels Exp $
+ * $Id: auth_negotiate.cc,v 1.16 2007/05/09 07:36:31 wessels Exp $
  *
  * DEBUG: section 29    Negotiate Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -51,7 +51,7 @@
 #include "wordlist.h"
 
 static void
-authenticateNegotiateReleaseServer(auth_user_request_t * auth_user_request);
+authenticateNegotiateReleaseServer(AuthUserRequest * auth_user_request);
 
 
 static void
@@ -284,7 +284,7 @@ AuthNegotiateUserRequest::addHeader(HttpReply * rep, int accel)
 }
 
 void
-AuthNegotiateConfig::fixHeader(auth_user_request_t *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request)
+AuthNegotiateConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request)
 {
     AuthNegotiateUserRequest *negotiate_request;
 
@@ -370,7 +370,7 @@ authenticateNegotiateHandleReply(void *data, void *lastserver, char *reply)
     stateful_helper_callback_t result = S_HELPER_UNKNOWN;
     char *blob, *arg = NULL;
 
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     AuthUser *auth_user;
     NegotiateUser *negotiate_user;
     AuthNegotiateUserRequest *negotiate_request;
@@ -553,7 +553,7 @@ AuthNegotiateUserRequest::module_start(RH * handler, void *data)
 
 /* clear the NEGOTIATE helper of being reserved for future requests */
 static void
-authenticateNegotiateReleaseServer(auth_user_request_t * auth_user_request)
+authenticateNegotiateReleaseServer(AuthUserRequest * auth_user_request)
 {
     AuthNegotiateUserRequest *negotiate_request;
     assert(auth_user_request->user()->auth_type == AUTH_NEGOTIATE);
diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h
index 538608627f..624f408b43 100644
--- a/src/auth/negotiate/auth_negotiate.h
+++ b/src/auth/negotiate/auth_negotiate.h
@@ -29,7 +29,7 @@ typedef enum {
 typedef struct
 {
     void *data;
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     RH *handler;
 }
 
@@ -109,7 +109,7 @@ public:
     virtual AuthUserRequest *decode(char const *proxy_auth);
     virtual void done();
     virtual void dump(StoreEntry *, const char *, AuthConfig *);
-    virtual void fixHeader(auth_user_request_t *, HttpReply *, http_hdr_type, HttpRequest *);
+    virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *);
     virtual void init(AuthConfig *);
     virtual void parse(AuthConfig *, int, char *);
     virtual void registerWithCacheManager(CacheManager & manager);
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 818c17a24a..bff9535bb7 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_ntlm.cc,v 1.64 2007/05/07 18:38:41 wessels Exp $
+ * $Id: auth_ntlm.cc,v 1.65 2007/05/09 07:36:31 wessels Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -51,7 +51,7 @@
 #include "wordlist.h"
 
 static void
-authenticateNTLMReleaseServer(auth_user_request_t * auth_user_request);
+authenticateNTLMReleaseServer(AuthUserRequest * auth_user_request);
 
 
 static void
@@ -263,7 +263,7 @@ AuthNTLMUserRequest::module_direction()
 }
 
 void
-AuthNTLMConfig::fixHeader(auth_user_request_t *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request)
+AuthNTLMConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request)
 {
     AuthNTLMUserRequest *ntlm_request;
 
@@ -336,7 +336,7 @@ authenticateNTLMHandleReply(void *data, void *lastserver, char *reply)
     stateful_helper_callback_t result = S_HELPER_UNKNOWN;
     char *blob;
 
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     AuthUser *auth_user;
     NTLMUser *ntlm_user;
     AuthNTLMUserRequest *ntlm_request;
@@ -484,7 +484,7 @@ AuthNTLMUserRequest::module_start(RH * handler, void *data)
 
 /* clear the NTLM helper of being reserved for future requests */
 static void
-authenticateNTLMReleaseServer(auth_user_request_t * auth_user_request)
+authenticateNTLMReleaseServer(AuthUserRequest * auth_user_request)
 {
     AuthNTLMUserRequest *ntlm_request;
     assert(auth_user_request->user()->auth_type == AUTH_NTLM);
diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h
index fde75ee622..8006d6b03c 100644
--- a/src/auth/ntlm/auth_ntlm.h
+++ b/src/auth/ntlm/auth_ntlm.h
@@ -29,7 +29,7 @@ typedef enum {
 typedef struct
 {
     void *data;
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     RH *handler;
 }
 
@@ -107,7 +107,7 @@ public:
     virtual AuthUserRequest *decode(char const *proxy_auth);
     virtual void done();
     virtual void dump(StoreEntry *, const char *, AuthConfig *);
-    virtual void fixHeader(auth_user_request_t *, HttpReply *, http_hdr_type, HttpRequest *);
+    virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *);
     virtual void init(AuthConfig *);
     virtual void parse(AuthConfig *, int, char *);
     virtual void registerWithCacheManager(CacheManager & manager);
diff --git a/src/client_side.h b/src/client_side.h
index ad79fe414e..41fea61ea0 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.h,v 1.20 2007/04/06 04:50:06 rousskov Exp $
+ * $Id: client_side.h,v 1.21 2007/05/09 07:36:24 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -170,7 +170,7 @@ public:
      * note this is ONLY connection based because NTLM is against HTTP spec.
      * the user details for connection based authentication
      */
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     /*
      * used by the owner of the connection, opaque otherwise
      * TODO: generalise the connection owner concept.
diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index ef72b8f485..38dc646c5d 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.cc,v 1.124 2007/05/08 17:26:54 rousskov Exp $
+ * $Id: client_side_reply.cc,v 1.125 2007/05/09 07:36:24 wessels Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -93,7 +93,7 @@ clientReplyContext::setReplyToError(
     err_type err, http_status status, method_t method, char const *uri,
 
     struct IN_ADDR *addr, HttpRequest * failedrequest, char *unparsedrequest,
-    auth_user_request_t * auth_user_request)
+    AuthUserRequest * auth_user_request)
 {
     ErrorState *errstate =
         clientBuildError(err, status, uri, addr, failedrequest);
diff --git a/src/client_side_reply.h b/src/client_side_reply.h
index 93348c8859..de223bbc30 100644
--- a/src/client_side_reply.h
+++ b/src/client_side_reply.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.h,v 1.16 2006/10/26 19:42:24 serassio Exp $
+ * $Id: client_side_reply.h,v 1.17 2007/05/09 07:36:24 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -76,7 +76,7 @@ public:
     int storeOKTransferDone() const;
     int storeNotOKTransferDone() const;
 
-    void setReplyToError(err_type, http_status, method_t, char const *, struct IN_ADDR *, HttpRequest *, char *, auth_user_request_t *);
+    void setReplyToError(err_type, http_status, method_t, char const *, struct IN_ADDR *, HttpRequest *, char *, AuthUserRequest *);
     void createStoreEntry(method_t m, request_flags flags);
     void removeStoreReference(store_client ** scp, StoreEntry ** ep);
     void removeClientStoreReference(store_client **scp, ClientHttpRequest *http);
diff --git a/src/errorpage.h b/src/errorpage.h
index e909925d71..592ab8e391 100644
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.h,v 1.2 2006/08/25 15:22:34 serassio Exp $
+ * $Id: errorpage.h,v 1.3 2007/05/09 07:36:24 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -45,7 +45,7 @@ public:
     err_type type;
     int page_id;
     http_status httpStatus;
-    auth_user_request_t *auth_user_request;
+    AuthUserRequest *auth_user_request;
     HttpRequest *request;
     char *url;
     int xerrno;
diff --git a/src/typedefs.h b/src/typedefs.h
index 7f8f5af9d6..05349e6bef 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.188 2006/08/21 00:50:41 robertc Exp $
+ * $Id: typedefs.h,v 1.189 2007/05/09 07:36:24 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -59,7 +59,7 @@ typedef struct _acl_deny_info_list acl_deny_info_list;
 typedef class AuthUser auth_user_t;
 
 class AuthUserRequest;
-typedef AuthUserRequest auth_user_request_t;
+typedef AuthUserRequest AuthUserRequest;
 
 typedef struct AuthUserHashPointer auth_user_hash_pointer;