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

Code cleanup

Browse Source
This commit is contained in:
Ilia Ross
2023-11-05 19:13:28 +02:00
parent 02eb35d622
commit 62b6b32719
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql/mysql-lib.pl
View File

@@ -1028,26 +1028,26 @@ sub execute_sql_file
if (&is_readonly_mode()) {
return (0, undef);
}
local ($db, $file, $user, $pass) = @_;
my ($db, $file, $user, $pass) = @_;
-r $file || return (1, "$file does not exist");
local $authstr = &make_authstr($user, $pass);
local $cs = $sql_charset ? "--default-character-set=".quotemeta($sql_charset)
my $authstr = &make_authstr($user, $pass);
my $cs = $sql_charset ? "--default-character-set=".quotemeta($sql_charset)
: "";
local $temp = &transname();
my $temp = &transname();
$file = &fix_collation($file);
&open_tempfile(TEMP, ">$temp");
&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.
my $cmd = "$config{'mysql'} $authstr -t ".quotemeta($db)." ".$cs.
" <".quotemeta($temp);
if ($_[4] && $_[4] ne 'root' && $< == 0) {
# Restoring as a Unix user
$cmd = &command_as_user($_[4], 0, $cmd);
}
local $out = &backquote_logged("$cmd 2>&1");
local @rv;
my $out = &backquote_logged("$cmd 2>&1");
my @rv;
if ($?) {
# Total failure
@rv = ($?, $out || "$cmd failed");