michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-23 04:20:32 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Properly handle case where showmount command is missing https://github.com/webmin/webmin/issues/1829

Browse Source
This commit is contained in:
Jamie Cameron
2023-01-23 21:27:09 -08:00
parent 4b5f3d7ccd
commit 00f8bb60d4
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mount/linux-lib.pl
View File

@@ -1680,20 +1680,20 @@ if (($_[0] eq "nfs") || ($_[0] eq "nfs4")) {
elsif ($?) {
&error(&text('linux_elist', $out));
}
}
# Validate directory name for NFSv3 (in v4 '/' exists)
foreach (split(/\n/, $out)) {
if (/^(\/\S+)/) {
$dirlist .= "$1\n";
push(@dirlist, $1);
# Validate directory name for NFSv3 (in v4 '/' exists)
foreach (split(/\n/, $out)) {
if (/^(\/\S+)/) {
$dirlist .= "$1\n";
push(@dirlist, $1);
}
}
}
if ($_[0] ne "nfs4" && $in{'nfs_dir'} !~ /^\/.*$/ &&
&indexof($in{'nfs_dir'}, @dirlist) < 0) {
&error(&text('linux_enfsdir', $in{'nfs_dir'},
$in{'nfs_host'}, "<pre>$dirlist</pre>"));
if ($_[0] ne "nfs4" && $in{'nfs_dir'} !~ /^\/.*$/ &&
&indexof($in{'nfs_dir'}, @dirlist) < 0) {
&error(&text('linux_enfsdir', $in{'nfs_dir'},
$in{'nfs_host'}, "<pre>$dirlist</pre>"));
}
}
return "$in{nfs_host}:$in{nfs_dir}";