michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert incorrect "Simplify permission mappings"

Browse Source 
https://forum.virtualmin.com/t/mariadb-database-server-error-when-i-try-to-create-a-new-user/132406/5?u=ilia
This commit is contained in:
Ilia Ross
2025-03-04 17:14:11 +02:00
parent 431ca1a491
commit a125de44a4
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql/mysql-lib.pl
View File

@@ -1766,10 +1766,11 @@ return undef if (!ref($rv) || !@{$rv->{'data'}});
return $rv->{'data'}->[0]->[1];
}
# perms_column_to_privilege_map()
# perms_column_to_privilege_map(col)
# Returns a privilege name based on given column for MySQL 8+ and MariaDB 10.4
sub perms_column_to_privilege_map
{
my ($column) = @_;
my %priv = (
'Alter_priv', 'alter',
'Alter_routine_priv', 'alter routine',
@@ -1800,9 +1801,15 @@ my %priv = (
'Super_priv', 'super',
'Trigger_priv', 'trigger',
'Update_priv', 'update',
'Delete_history_priv', 'delete history',
# 'Create_role_priv', 'create role',
# 'Drop_role_priv', 'drop role',
# 'proxies_priv', 'proxy',
);
return \%priv;
return defined($column) ? $priv{$column} : \%priv;
}
# update_privileges(\%sconfig)
@@ -1821,8 +1828,8 @@ my ($ver, $variant) = &get_remote_mysql_variant();
if ($variant eq "mariadb" && &compare_version_numbers($ver, "10.4") >= 0) {
# Assign permissions
my $col_to_priv_map = &perms_column_to_privilege_map();
foreach my $grant (keys %$perms) {
my $grant_priv = $perms->{$grant};
foreach my $grant (keys %{ $perms }) {
my $grant_priv = &perms_column_to_privilege_map($grant);
&execute_sql_logged($mysql::master_db, "grant $grant_priv on *.* to '$user'\@'$host'");
delete $col_to_priv_map->{$grant};
}