---------------------
PatchSet 904 
Date: 2000/12/12 03:01:48
Author: rbcollins
Branch: auth_rewrite
Tag: (none) 
Log:
forgot a couple of enum changes

Members: 
	src/authenticate.c:1.1.1.3.12.17.2.10->1.1.1.3.12.17.2.11 

Index: squid/src/authenticate.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/authenticate.c,v
retrieving revision 1.1.1.3.12.17.2.10
retrieving revision 1.1.1.3.12.17.2.11
diff -u -r1.1.1.3.12.17.2.10 -r1.1.1.3.12.17.2.11
--- squid/src/authenticate.c	11 Dec 2000 23:32:14 -0000	1.1.1.3.12.17.2.10
+++ squid/src/authenticate.c	12 Dec 2000 03:01:48 -0000	1.1.1.3.12.17.2.11
@@ -1,6 +1,6 @@
 
 /*
- * $Id: authenticate.c,v 1.1.1.3.12.17.2.10 2000/12/11 23:32:14 rbcollins Exp $
+ * $Id: authenticate.c,v 1.1.1.3.12.17.2.11 2000/12/12 03:01:48 rbcollins Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Duane Wessels
@@ -148,7 +148,7 @@
     if (!proxy_auth_hash) {     /* not in the hash table */
         debug(29, 4)
             ("authenticateGetAuthUser: proxy-auth cache miss. Decoding header details.\n");
-        auth_user = memAllocate(MEM_ACL_PROXY_AUTH_USER);
+        auth_user = memAllocate(MEM_AUTH_USER_T);
         authenticateDecodeAuth(proxy_auth, auth_user);
     } else {
         debug(29, 4)
@@ -415,7 +415,7 @@
             (hash_link *) u->usernamehash);
         /* don't free the key as we use the same user string as the auth_user 
          * structure */
-        memFree(u->usernamehash, MEM_ACL_PROXY_AUTH_HASH);
+        memFree(u->usernamehash, MEM_AUTH_USER_HASH);
     }
     /* were they linked in by one or more proxy-authenticate headers */
     link = u->proxy_auth_list.head;
@@ -428,7 +428,7 @@
         hash_remove_link(proxy_auth_cache, (hash_link *) proxy_auth_hash);
         /* free the key (usually the proxy_auth header) */
         xfree(proxy_auth_hash->key);
-        memFree(proxy_auth_hash, MEM_ACL_PROXY_AUTH_HASH);
+        memFree(proxy_auth_hash, MEM_AUTH_USER_HASH);
     }
     /* free cached acl results */
     aclCacheMatchFlush(&u->proxy_match_cache);
@@ -455,7 +455,7 @@
 #endif
     /* prevent accidental reuse */
     u->auth_type=AUTH_UNKNOWN;
-    memFree(u, MEM_ACL_PROXY_AUTH_USER);
+    memFree(u, MEM_AUTH_USER_T);
 }
 
 void
@@ -559,7 +559,7 @@
 authenticateProxyAuthCacheAddLink(const char *key, auth_user_t *auth_user){
     auth_user_hash_pointer *proxy_auth_hash;
     proxy_auth_hash =
-        memAllocate(MEM_ACL_PROXY_AUTH_HASH);
+        memAllocate(MEM_AUTH_USER_HASH);
     proxy_auth_hash->key = xstrdup(key);
     proxy_auth_hash->auth_user = auth_user;
     dlinkAddTail(proxy_auth_hash, &proxy_auth_hash->link,
@@ -592,7 +592,7 @@
 void
 authenticateUserNameCacheAdd(auth_user_t *auth_user){
     auth_user_hash_pointer *usernamehash;
-    usernamehash = memAllocate(MEM_ACL_PROXY_AUTH_HASH);
+    usernamehash = memAllocate(MEM_AUTH_USER_HASH);
     usernamehash->key = authenticateUserUsername(auth_user);
     usernamehash->auth_user = auth_user;
     hash_join(proxy_auth_username_cache, (hash_link *) usernamehash);