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

Fix to quote usernames in xfs_quota command

Browse Source 
https://forum.virtualmin.com/t/issue-regarding-with-restore/129843/4?u=ilia
This commit is contained in:
Ilia Ross
2024-10-16 12:28:39 +03:00
parent 643270f3d9
commit 00f11fc81d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
quota/linux-lib.pl
View File

@@ -411,7 +411,7 @@ sub user_filesystems
my ($user) = @_;
my $n = 0;
if (&has_command("xfs_quota")) {
$n = &parse_xfs_quota_output("xfs_quota -xc 'quota -b -i -u $user'");
$n = &parse_xfs_quota_output("xfs_quota -xc 'quota -b -i -u \'$user\''");
}
return &parse_quota_output($config{'user_quota_command'}." ".
quotemeta($user), $n);
@@ -429,7 +429,7 @@ sub group_filesystems
my ($group) = @_;
my $n = 0;
if (&has_command("xfs_quota")) {
$n = &parse_xfs_quota_output("xfs_quota -xc 'quota -b -i -g $group'");
$n = &parse_xfs_quota_output("xfs_quota -xc 'quota -b -i -g \'$group\''");
}
return &parse_quota_output($config{'group_quota_command'}." ".
quotemeta($group), $n);
@@ -1010,7 +1010,9 @@ Set XFS quotas for some user and FS
sub set_user_quota
{
my ($user, $fs, $sblocks, $hblocks, $sfiles, $hfiles) = @_;
my $out = &backquote_logged("xfs_quota -x -c 'limit -u bsoft=${sblocks}k bhard=${hblocks}k isoft=$sfiles ihard=$hfiles $user' $fs 2>&1");
my $out = &backquote_logged("xfs_quota -x -c 'limit -u bsoft=${sblocks}k ".
"bhard=${hblocks}k isoft=$sfiles ihard=$hfiles ".
"\'$user\'' $fs 2>&1");
&error($out) if ($?);
}
@@ -1027,7 +1029,9 @@ Set XFS quotas for some group and FS
sub set_group_quota
{
my ($group, $fs, $sblocks, $hblocks, $sfiles, $hfiles) = @_;
my $out = &backquote_logged("xfs_quota -x -c 'limit -g bsoft=${sblocks}k bhard=${hblocks}k isoft=$sfiles ihard=$hfiles $group' $fs 2>&1");
my $out = &backquote_logged("xfs_quota -x -c 'limit -g bsoft=${sblocks}k ".
"bhard=${hblocks}k isoft=$sfiles ihard=$hfiles ".
"\'$group\'' $fs 2>&1");
&error($out) if ($?);
}