VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-29 11:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad file descriptor error https://forum.virtualmin.com/t/sql-execution-sql-backup-restore-fails/123116

Browse Source
This commit is contained in:
Jamie Cameron
2023-10-25 02:24:31 -07:00
parent 6942ce7f0f
commit 9cade51106
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql/mysql-lib.pl
View File

@ -1028,19 +1028,20 @@ sub execute_sql_file
if (&is_readonly_mode()) { if (&is_readonly_mode()) {
return (0, undef); return (0, undef);
} }
-r $file || return (1, "$file does not exist");
local ($db, $file, $user, $pass) = @_; local ($db, $file, $user, $pass) = @_;
local $authstr = &make_authstr($user, $pass); local $authstr = &make_authstr($user, $pass);
local $cs = $sql_charset ? "--default-character-set=".quotemeta($sql_charset) local $cs = $sql_charset ? "--default-character-set=".quotemeta($sql_charset)
: ""; : "";
local $temp = &transname(); local $temp = &transname();
$file = &fix_collation($file);
&open_tempfile(TEMP, ">$temp"); &open_tempfile(TEMP, ">$temp");
&print_tempfile(TEMP, "source ".&fix_collation($file).";\n"); &print_tempfile(TEMP, "source ".$file.";\n");
&close_tempfile(TEMP); &close_tempfile(TEMP);
&set_ownership_permissions(undef, undef, 0644, $temp); &set_ownership_permissions(undef, undef, 0644, $temp);
&set_authstr_env(); &set_authstr_env();
local $cmd = "$config{'mysql'} $authstr -t ".quotemeta($db)." ".$cs. local $cmd = "$config{'mysql'} $authstr -t ".quotemeta($db)." ".$cs.
" <".quotemeta($temp); " <".quotemeta($temp);
-r $file || return (1, "$file does not exist");
if ($_[4] && $_[4] ne 'root' && $< == 0) { if ($_[4] && $_[4] ne 'root' && $< == 0) {
# Restoring as a Unix user # Restoring as a Unix user
$cmd = &command_as_user($_[4], 0, $cmd); $cmd = &command_as_user($_[4], 0, $cmd);