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

Always set ENV{'PASS'} when needed https://sourceforge.net/p/webadmin/bugs/5542/

Browse Source
This commit is contained in:
Jamie Cameron
2022-02-01 19:34:40 -08:00
parent 9146fc9969
commit dd5bce5adf
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mysql/mysql-lib.pl
View File

@@ -121,8 +121,12 @@ local $port = defined($_[3]) ? $_[3] : $config{'port'};
local $sock = defined($_[4]) ? $_[4] : $config{'sock'};
local $unix = $_[5];
if (&supports_env_pass($unix)) {
$ENV{'MYSQL_PWD'} = $pass;
$make_authstr_pass = $pass;
}
else {
$make_authstr_pass = undef;
}
&set_authstr_env();
return ($sock ? " -S $sock" : "").
($host ? " -h $host" : "").
($port ? " -P $port" : "").
@@ -133,6 +137,18 @@ return ($sock ? " -S $sock" : "").
$pass ? " -p".quotemeta($pass) : "");
}
# set_authstr_env()
# Set any environment variables that make_authstr requires
sub set_authstr_env
{
if (defined($make_authstr_pass)) {
$ENV{'MYSQL_PWD'} = $make_authstr_pass;
}
else {
delete($ENV{'MYSQL_PWD'});
}
}
# is_mysql_running()
# Returns 1 if mysql is running, 0 if not, or -1 if running but
# inaccessible without a password. When called in an array context, also
@@ -352,6 +368,7 @@ else {
}
print TEMP $sql,"\n";
close(TEMP);
&set_authstr_env();
open(DBS, "\"$config{'mysql'}\" $authstr -E -t ".quotemeta($_[0])." <$temp 2>&1 |");
local $t = &parse_mysql_vertical(DBS);
close(DBS);
@@ -1005,6 +1022,7 @@ local $temp = &transname();
&print_tempfile(TEMP, "source ".$file.";\n");
&close_tempfile(TEMP);
&set_ownership_permissions(undef, undef, 0644, $temp);
&set_authstr_env();
local $cmd = "$config{'mysql'} $authstr -t ".quotemeta($db)." ".$cs.
" <".quotemeta($temp);
-r $file || return (1, "$file does not exist");
@@ -1488,6 +1506,7 @@ if ($user && $user ne "root") {
# Actual writing of output is done as another user
$writer = &command_as_user($user, 0, $writer);
}
&set_authstr_env();
local $cmd = "$config{'mysqldump'} $authstr $dropsql $singlesql $forcesql $quicksql $parameterssql $wheresql $charsetsql $compatiblesql $quotingsql $routinessql ".quotemeta($db)." $tablessql $eventssql $gtidsql | $writer";
if (&shell_is_bash()) {
$cmd = "set -o pipefail ; $cmd";