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

Refactored find_mpvio_user. The loop that searches for the user is now a

Browse Source 
separate function.
This commit is contained in:
Vicențiu Ciorbaru
2013-10-17 20:44:51 -07:00
committed by Sergei Golubchik
parent e8d6425875
commit cf9ebd72c4
1 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sql/sql_acl.cc
View File

@ -636,7 +636,8 @@ static void rebuild_check_host(void);
static void rebuild_role_grants(void); static void rebuild_role_grants(void);
static void free_acl_user(ACL_USER *acl_user); static void free_acl_user(ACL_USER *acl_user);
static ACL_USER *find_user_no_anon(const char *host, const char *user, static ACL_USER *find_user_no_anon(const char *host, const char *user,
my_bool exact); my_bool exact);
static ACL_USER *find_user(const char *host, const char *user, const char *ip);
static ACL_USER *find_acl_role(const char *user); static ACL_USER *find_acl_role(const char *user);
static bool update_user_table(THD *thd, TABLE *table, const char *host, static bool update_user_table(THD *thd, TABLE *table, const char *host,
const char *user, const char *new_password, const char *user, const char *new_password,
@ -2412,6 +2413,26 @@ bool is_acl_user(const char *host, const char *user)
} }
static ACL_USER *
find_user(const char *host, const char *user, const char *ip)
{
ACL_USER *result= NULL;
mysql_mutex_assert_owner(&acl_cache->lock);
for (uint i=0; i < acl_users.elements; i++)
{
ACL_USER *acl_user_tmp= dynamic_element(&acl_users, i, ACL_USER*);
if ((!acl_user_tmp->user.str ||
!strcmp(user, acl_user_tmp->user.str)) &&
compare_hostname(&acl_user_tmp->host, host, ip))
{
result= acl_user_tmp;
break;
}
}
return result;
}
/* /*
Find first entry that matches the current user Find first entry that matches the current user
*/ */
@ -8703,17 +8724,11 @@ static bool find_mpvio_user(MPVIO_EXT *mpvio)
DBUG_ASSERT(mpvio->acl_user == 0); DBUG_ASSERT(mpvio->acl_user == 0);
mysql_mutex_lock(&acl_cache->lock); mysql_mutex_lock(&acl_cache->lock);
for (uint i=0; i < acl_users.elements; i++)
{ ACL_USER *user= find_user(sctx->host, sctx->user, sctx->ip);
ACL_USER *acl_user_tmp= dynamic_element(&acl_users, i, ACL_USER*); if (user)
if ((!acl_user_tmp->user.str || mpvio->acl_user= user->copy(&mem);
!strcmp(sctx->user, acl_user_tmp->user.str)) &&
compare_hostname(&acl_user_tmp->host, sctx->host, sctx->ip))
{
mpvio->acl_user= acl_user_tmp->copy(mpvio->thd->mem_root);
break;
}
}
mysql_mutex_unlock(&acl_cache->lock); mysql_mutex_unlock(&acl_cache->lock);
if (!mpvio->acl_user) if (!mpvio->acl_user)