database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Added initial_role_grants variable to ACL_USER

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2013-10-17 20:45:49 -07:00
committed by Sergei Golubchik
parent df16e75983
commit a5b8939807
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_acl.cc
View File

@ -231,6 +231,15 @@ public:
instance of the class represents a role. instance of the class represents a role.
*/ */
DYNAMIC_ARRAY role_grants; DYNAMIC_ARRAY role_grants;
/*
In case of granting a role to a role, the access bits are merged together
via a bit OR operation and placed in the ACL_USER::access field.
When rebuilding role_grants via the rebuild_role_grant function,
the ACL_USER::access field needs to be reset aswell. The field
initial_role_access holds the initial grants present in the table row.
*/
ulong initial_role_access;
ACL_USER *copy(MEM_ROOT *root) ACL_USER *copy(MEM_ROOT *root)
{ {
@ -1130,6 +1139,8 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
DBUG_PRINT("info", ("Found role %s", user.user.str)); DBUG_PRINT("info", ("Found role %s", user.user.str));
ACL_USER *entry= user.copy(&mem); ACL_USER *entry= user.copy(&mem);
entry->role_grants = user.role_grants; entry->role_grants = user.role_grants;
/* set initial role access the same as the table row privileges */
entry->initial_role_access = entry->access;
my_hash_insert(&acl_roles, (uchar *)entry); my_hash_insert(&acl_roles, (uchar *)entry);
HASH_SEARCH_STATE t; HASH_SEARCH_STATE t;
entry= (ACL_USER *) my_hash_first(&acl_roles, entry= (ACL_USER *) my_hash_first(&acl_roles,