WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support journaled quotas

This commit is contained in:
Roland Gruber 2011-02-11 18:52:52 +00:00
parent 72a5fcefce
commit 4c64b4c457
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lam/HISTORY
View File

@ -4,6 +4,7 @@
- LAM Pro: enhanced Zarafa to support users and groups for "Send as" (new configuration option) - LAM Pro: enhanced Zarafa to support users and groups for "Send as" (new configuration option)
- PDF export: higher resolution for logos - PDF export: higher resolution for logos
- reduced number of LDAP queries - reduced number of LDAP queries
- lamdaemon: support journaled quotas
- fixed bugs: - fixed bugs:
-> ignore comment lines in shells file (3107124) -> ignore comment lines in shells file (3107124)
-> home directory creation on file upload -> home directory creation on file upload

10
lam/lib/lamdaemon.pl
View File

@ -80,14 +80,14 @@ sub get_fs { # Load mountpoints from mtab if enabled quotas
Quota::endmntent(); Quota::endmntent();
my $j=0; my $k=0; $i=0; my $j=0; my $k=0; $i=0;
while ($args[$i][0]) { while ($args[$i][0]) {
if ( $args[$i][3] =~ m/usrquota/ ) { if ( $args[$i][3] =~ m/usr[j]?quota/ ) {
$quota_usr[$j][0] = $args[$i][0]; $quota_usr[$j][0] = $args[$i][0];
$quota_usr[$j][1] = $args[$i][1]; $quota_usr[$j][1] = $args[$i][1];
$quota_usr[$j][2] = $args[$i][2]; $quota_usr[$j][2] = $args[$i][2];
$quota_usr[$j][3] = $args[$i][3]; $quota_usr[$j][3] = $args[$i][3];
$j++; $j++;
} }
if ( $args[$i][3] =~ m/grpquota/ ) { if ( $args[$i][3] =~ m/grp[j]?quota/ ) {
$quota_grp[$k][0] = $args[$i][0]; $quota_grp[$k][0] = $args[$i][0];
$quota_grp[$k][1] = $args[$i][1]; $quota_grp[$k][1] = $args[$i][1];
$quota_grp[$k][2] = $args[$i][2]; $quota_grp[$k][2] = $args[$i][2];
@ -349,7 +349,9 @@ sub getQuotas {
while ($quota_usr[$i][0]) { while ($quota_usr[$i][0]) {
if ($vals[0]ne'+') { if ($vals[0]ne'+') {
$dev = Quota::getqcarg($quota_usr[$i][1]); $dev = Quota::getqcarg($quota_usr[$i][1]);
logMessage(LOG_ERR, "QDEV: " . $dev);
@temp = Quota::query($dev,$user[2],$group); @temp = Quota::query($dev,$user[2],$group);
logMessage(LOG_ERR, "QUOTA_ENTRY $user[2] $group $dev $quota_usr[$i][1],$temp[0],$temp[1],$temp[2],$temp[3],$temp[4],$temp[5],$temp[6],$temp[7]");
if ($temp[0]ne'') { if ($temp[0]ne'') {
if ($temp == -1) { if ($temp == -1) {
$return = "ERROR,Lamdaemon ($hostname),Unable to read quota!"; $return = "ERROR,Lamdaemon ($hostname),Unable to read quota!";
@ -359,9 +361,9 @@ sub getQuotas {
$return = "QUOTA_ENTRY $quota_usr[$i][1],$temp[0],$temp[1],$temp[2],$temp[3],$temp[4],$temp[5],$temp[6],$temp[7]:$return"; $return = "QUOTA_ENTRY $quota_usr[$i][1],$temp[0],$temp[1],$temp[2],$temp[3],$temp[4],$temp[5],$temp[6],$temp[7]:$return";
} }
} }
else { $return = "QUOTA_ENTRY $quota_usr[$i][1],0,0,0,0,0,0,0,0:$return"; } else { $return = "QUOTA_ENTRY $quota_usr[$i][1],0,0,0,0,0,0,0,0:$return"; logMessage(LOG_ERR, "Unable1 to read quota for $user[0].");}
} }
else { $return = "QUOTA_ENTRY $quota_usr[$i][1],0,0,0,0,0,0,0,0:$return"; } else { $return = "QUOTA_ENTRY $quota_usr[$i][1],0,0,0,0,0,0,0,0:$return"; logMessage(LOG_ERR, "Unable2 to read quota for $user[0].");}
$i++; $i++;
} }
($<, $>) = ($>, $<); # Give up root previleges ($<, $>) = ($>, $<); # Give up root previleges