diff options
| author | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2022-02-28 17:29:11 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2022-02-28 17:29:11 +0200 |
| commit | d71b99a61fe84a7c5757e629dd28eadd712e59f4 (patch) | |
| tree | 080ca7e28f01e38b871295df960545809dd80cdc | |
| parent | 6e7ece95a0f4ec6a217c80cf736d9aa5a2b49b6a (diff) | |
| download | mariadb-git-d71b99a61fe84a7c5757e629dd28eadd712e59f4.tar.gz | |
Fix rebase conflict
| -rw-r--r-- | sql/sql_acl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 3a47ee1466d..8e45c241147 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -15865,6 +15865,13 @@ bool acl_authenticate(THD *thd, uint com_change_user_pkt_len) #endif sctx->master_access= acl_user->access; + sctx->denies_active= NO_PRIV; + if (acl_user->denies) + { + sctx->master_access&= ~acl_user->denies->get_global(); + sctx->denies_active= acl_user->denies->get_specified_denies(); + } + strmake_buf(sctx->priv_user, acl_user->user.str); if (acl_user->host.hostname) |