VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Plugin needs a with prefix when used in SQL

Browse Source
This commit is contained in:
Jamie Cameron
2024-08-15 03:25:06 -07:00
parent 66ad3fe075
commit ffc7dac5f1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql/mysql-lib.pl
View File

@ -1712,7 +1712,7 @@ sub get_change_pass_sql
{
my ($unescaped_plainpass, $user, $host) = @_;
my $plugin = &get_mysql_plugin();
$plugin = $plugin ? "with '$plugin'" : "";
$plugin = $plugin ? "with $plugin" : "";
my $escaped_pass = &escapestr($unescaped_plainpass);
my $sql;
my ($ver, $variant) = &get_remote_mysql_variant();
@ -1870,6 +1870,7 @@ 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 ".
@ -1915,6 +1916,7 @@ my ($plainpass, $user, $host) = @_;
my ($ver, $variant) = &get_remote_mysql_variant();
my $plugin = &get_mysql_plugin();
$plugin = $plugin ? "with $plugin" : "";
my $lock_supported = $variant eq "mysql" && &compare_version_numbers($ver, "8.0.19");
my $mysql_mariadb_with_auth_string =
$variant eq "mariadb" && &compare_version_numbers($ver, "10.4") >= 0 ||