database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Added a reset_role_grants function specific for roles. The function also

Browse Source 
resets the initial role access bits.
This commit is contained in:
Vicențiu Ciorbaru
2013-10-17 20:49:47 -07:00
committed by Sergei Golubchik
parent aa4657f872
commit c968a59d6e
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/sql_acl.cc
View File

@@ -656,7 +656,9 @@ static my_bool grant_load(THD *thd, TABLE_LIST *tables);
static inline void get_grantor(THD *thd, char* grantor); static inline void get_grantor(THD *thd, char* grantor);
static my_bool acl_user_reset_grant(ACL_USER *user, static my_bool acl_user_reset_grant(ACL_USER *user,
void * not_used __attribute__((unused))); void * not_used __attribute__((unused)));
static my_bool add_role_user_mapping(ROLE_GRANT_PAIR *entry); static my_bool acl_role_reset_grant(ACL_USER *role,
void * not_used __attribute__((unused)));
static int add_role_user_mapping(ROLE_GRANT_PAIR *mapping);
/* /*
Enumeration of various ACL's and Hashes used in handle_grant_struct() Enumeration of various ACL's and Hashes used in handle_grant_struct()
@@ -1295,8 +1297,8 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
} }
my_hash_insert(&acl_roles_mappings, (uchar*) mapping); my_hash_insert(&acl_roles_mappings, (uchar*) mapping);
} }
free_root(&temp_root, MYF(0)); free_root(&temp_root, MYF(0));
end_read_record(&read_record_info); end_read_record(&read_record_info);
@@ -2120,11 +2122,25 @@ void rebuild_check_host(void)
init_check_host(); init_check_host();
} }
/*
Reset a role role_grants dynamic array.
Also, the role's access bits are reset to the ones present in the table.
The function can be used as a walk action for hash elements aswell.
*/
my_bool acl_role_reset_grant(ACL_USER *role,
void * not_used __attribute__((unused)))
{
reset_dynamic(&role->role_grants);
/* Also reset the role access bits */
role->access= role->initial_role_access;
return 0;
}
/* /*
Reset a users role_grants dynamic array. Reset a users role_grants dynamic array.
The function can is used as a walk action for hash elements aswell. The function can be used as a walk action for hash elements aswell.
*/ */
my_bool acl_user_reset_grant(ACL_USER *user, my_bool acl_user_reset_grant(ACL_USER *user,
void * not_used __attribute__((unused))) void * not_used __attribute__((unused)))
@@ -2180,7 +2196,7 @@ void rebuild_role_grants(void)
acl_user_reset_grant(user, NULL); acl_user_reset_grant(user, NULL);
} }
my_hash_iterate(&acl_roles, my_hash_iterate(&acl_roles,
(my_hash_walk_action) acl_user_reset_grant, NULL); (my_hash_walk_action) acl_role_reset_grant, NULL);
/* /*
Rebuild the direct links between users and roles in ACL_USER::role_grants Rebuild the direct links between users and roles in ACL_USER::role_grants