From: hno <> Date: Mon, 8 Jan 2001 03:11:16 +0000 (+0000) Subject: s/MEM_ACL_PROXY_AUTH_DATA/MEM_ACL_USER_DATA/ X-Git-Tag: SQUID_3_0_PRE1~1674 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a72fdaa721249f7b64408a42212ad0663a7298f4;p=thirdparty%2Fsquid.git s/MEM_ACL_PROXY_AUTH_DATA/MEM_ACL_USER_DATA/ --- diff --git a/src/acl.cc b/src/acl.cc index 2720fe85d1..9685b9c4fa 100644 --- a/src/acl.cc +++ b/src/acl.cc @@ -1,6 +1,6 @@ /* - * $Id: acl.cc,v 1.234 2001/01/07 19:55:20 hno Exp $ + * $Id: acl.cc,v 1.235 2001/01/07 20:11:16 hno Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -645,7 +645,7 @@ aclParseUserList(void **current) debug(28, 2) ("aclParseUserList: parsing authlist\n"); if (*current == NULL) { debug(28, 3) ("aclParseUserList: current is null. Creating\n"); - *current = memAllocate(MEM_ACL_PROXY_AUTH_DATA); /*we rely on mA. zeroing */ + *current = memAllocate(MEM_ACL_USER_DATA); /*we rely on mA. zeroing */ } data = *current; if ((t = strtokFile())) { @@ -1953,7 +1953,7 @@ aclFreeUserData(void *data) { acl_user_data *d = data; splay_destroy(d->names, xfree); - memFree(d, MEM_ACL_PROXY_AUTH_DATA); + memFree(d, MEM_ACL_USER_DATA); } diff --git a/src/enums.h b/src/enums.h index 2f00c510c4..cbb452877a 100644 --- a/src/enums.h +++ b/src/enums.h @@ -1,6 +1,6 @@ /* - * $Id: enums.h,v 1.180 2001/01/07 14:47:17 hno Exp $ + * $Id: enums.h,v 1.181 2001/01/07 20:11:18 hno Exp $ * * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -517,7 +517,7 @@ typedef enum { MEM_ACL_IP_DATA, MEM_ACL_LIST, MEM_ACL_NAME_LIST, - MEM_ACL_PROXY_AUTH_DATA, + MEM_ACL_USER_DATA, MEM_ACL_PROXY_AUTH_USER, MEM_ACL_TIME_DATA, MEM_CACHEMGR_PASSWD, diff --git a/src/mem.cc b/src/mem.cc index 52b46180f4..52692e6018 100644 --- a/src/mem.cc +++ b/src/mem.cc @@ -1,6 +1,6 @@ /* - * $Id: mem.cc,v 1.51 2001/01/07 19:55:20 hno Exp $ + * $Id: mem.cc,v 1.52 2001/01/07 20:11:18 hno Exp $ * * DEBUG: section 13 High Level Memory Pool Management * AUTHOR: Harvest Derived @@ -204,7 +204,7 @@ memInit(void) memDataInit(MEM_ACL_LIST, "acl_list", sizeof(acl_list), 0); memDataInit(MEM_ACL_NAME_LIST, "acl_name_list", sizeof(acl_name_list), 0); memDataInit(MEM_ACL_TIME_DATA, "acl_time_data", sizeof(acl_time_data), 0); - memDataInit(MEM_ACL_PROXY_AUTH_DATA, "acl_user_data", + memDataInit(MEM_ACL_USER_DATA, "acl_user_data", sizeof(acl_user_data), 0); memDataInit(MEM_ACL_PROXY_AUTH_USER, "acl_proxy_auth_user", sizeof(acl_proxy_auth_user), 0);