michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-14 10:40:29 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix MariaDB create user auth plugin syntax
Some checks failed
webmin.dev: webmin/webmin / build (push) Has been cancelled
Details

Browse Source 
* Note: Use MariaDB-compatible IDENTIFIED VIA ... USING PASSWORD(...) syntax when creating users with an explicit authentication plugin, while preserving default password creation and MySQL behavior.

https://forum.virtualmin.com/t/mariadb-syntax-change-on-rocky-10/137187
This commit is contained in:
Ilia Ross
2026-05-13 02:20:42 +02:00
parent 911aa64a36
commit 413087ae84
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql/mysql-lib.pl
View File

@@ -2006,11 +2006,12 @@ my $other_field_values = $sc->{'other_field_values'};
my ($ver, $variant) = &get_remote_mysql_variant();
my $plugin = $sc->{'plugin'} || &get_mysql_plugin();
$plugin = $plugin ? "with $plugin" : "";
if ($variant eq "mariadb" && &compare_version_numbers($ver, "10.4") >= 0) {
my $sql = "create user '$user'\@'$host' identified $plugin by ".
"'".&escapestr($pass)."'";
my $auth = $plugin ?
&get_plugin_sql($ver, $variant, $pass, $plugin) :
"identified by '".&escapestr($pass)."'";
my $sql = "create user '$user'\@'$host' $auth";
&execute_sql_logged($master_db, $sql);
&execute_sql_logged($master_db, 'flush privileges');
@@ -2036,6 +2037,7 @@ else {
&execute_sql_logged($master_db, 'flush privileges');
if ($variant eq "mysql" && &compare_version_numbers($ver, "5.7.6") >= 0) {
$plugin = $plugin ? "with $plugin" : "";
&execute_sql_logged($master_db,
"alter user '$user'\@'$host' identified $plugin by ".
"'".&escapestr($pass)."'");