upload changes
This commit is contained in:
parent
c81a51f56d
commit
87edb86047
1858
lam/lib/account.inc
1858
lam/lib/account.inc
File diff suppressed because it is too large
Load Diff
|
@ -71,11 +71,10 @@ if ($( == 0 ) { # we are root
|
||||||
if ($ARGV[0] eq "*test") {
|
if ($ARGV[0] eq "*test") {
|
||||||
use Quota; # Needed to get and set quotas
|
use Quota; # Needed to get and set quotas
|
||||||
print "Perl quota module successfully installed.\n";
|
print "Perl quota module successfully installed.\n";
|
||||||
print "IF you haven't seen any errors lamdaemon.pl was set up successfully.\n";
|
print "If you haven't seen any errors lamdaemon.pl was set up successfully.\n";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
# loop for every transmitted user
|
# loop for every transmitted user
|
||||||
# XXX fixme change code to read stdin at once and then loop
|
|
||||||
my $string = do {local $/;<STDIN>};
|
my $string = do {local $/;<STDIN>};
|
||||||
@input = split ("\n", $string );
|
@input = split ("\n", $string );
|
||||||
for ($i=0; $i<=$#input; $i++) {
|
for ($i=0; $i<=$#input; $i++) {
|
||||||
|
@ -103,21 +102,30 @@ if ($( == 0 ) { # we are root
|
||||||
system '/usr/sbin/useradd.local', $user[0]; # run useradd-script
|
system '/usr/sbin/useradd.local', $user[0]; # run useradd-script
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
$return = "ERROR,Lamdaemon,Homedirectory already exists.:$return";
|
||||||
|
}
|
||||||
($<, $>) = ($>, $<); # Give up root previleges
|
($<, $>) = ($>, $<); # Give up root previleges
|
||||||
last switch2;
|
last switch2;
|
||||||
};
|
};
|
||||||
$vals[2] eq 'rem' && do {
|
$vals[2] eq 'rem' && do {
|
||||||
($<, $>) = ($>, $<); # Get root previliges
|
($<, $>) = ($>, $<); # Get root previliges
|
||||||
if (-d $user[7]) {
|
if (-d $user[7]) {
|
||||||
|
# Fixme, only delete files owned by user.
|
||||||
system 'rm', '-R', $user[7]; # Delete Homedirectory
|
system 'rm', '-R', $user[7]; # Delete Homedirectory
|
||||||
if (-e '/usr/sbin/userdel.local') {
|
if (-e '/usr/sbin/userdel.local') {
|
||||||
system '/usr/sbin/userdel.local', $user[0];
|
system '/usr/sbin/userdel.local', $user[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
$return = "ERROR,Lamdaemon,Homedirectory doesn't exists.:$return";
|
||||||
|
}
|
||||||
($<, $>) = ($>, $<); # Give up root previleges
|
($<, $>) = ($>, $<); # Give up root previleges
|
||||||
last switch2;
|
last switch2;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
# Show error if undfined command is used
|
||||||
|
$return = "ERROR,Lamdaemon,Unknown command $vals[2].:$return";
|
||||||
last switch;
|
last switch;
|
||||||
};
|
};
|
||||||
$vals[1] eq 'quota' && do {
|
$vals[1] eq 'quota' && do {
|
||||||
|
@ -182,9 +190,11 @@ if ($( == 0 ) { # we are root
|
||||||
($<, $>) = ($>, $<); # Give up root previleges
|
($<, $>) = ($>, $<); # Give up root previleges
|
||||||
last switch2;
|
last switch2;
|
||||||
};
|
};
|
||||||
|
$return = "ERROR,Lamdaemon,Unknown command $vals[2].:$return";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
last switch;
|
last switch;
|
||||||
|
$return = "ERROR,Lamdaemon,Unknown command $vals[1].:$return";
|
||||||
};
|
};
|
||||||
print "$return\n";
|
print "$return\n";
|
||||||
}
|
}
|
||||||
|
|
|
@ -189,12 +189,12 @@ class shadowAccount {
|
||||||
$this->attributes['shadowExpire'][0] = intval(mktime(10, 0, 0, $post['shadowExpire_mon'],
|
$this->attributes['shadowExpire'][0] = intval(mktime(10, 0, 0, $post['shadowExpire_mon'],
|
||||||
$post['shadowExpire_day'], $post['shadowExpire_yea'])/3600/24);
|
$post['shadowExpire_day'], $post['shadowExpire_yea'])/3600/24);
|
||||||
|
|
||||||
if ( !ereg('^([0-9])*$', $this->attributes['shadowMin'][0])) $errors[] = array('ERROR', _('Password minage'), _('Password minage must be are natural number.'), 'shadowMin');
|
if ( !ereg('^([0-9])*$', $this->attributes['shadowMin'][0])) $errors['shadowMin'][] = array('ERROR', _('Password minage'), _('Password minage must be are natural number.'));
|
||||||
if ( $this->attributes['shadowMin'][0] > $this->attributes['shadowMax'][0] ) $errors[] = array('ERROR', _('Password maxage'), _('Password maxage must bigger as Password Minage.'), 'shadowMin');
|
if ( $this->attributes['shadowMin'][0] > $this->attributes['shadowMax'][0]) $errors['shadowMin'][] = array('ERROR', _('Password maxage'), _('Password maxage must bigger as Password Minage.'));
|
||||||
if ( !ereg('^([0-9]*)$', $this->attributes['shadowMax'][0])) $errors[] = array('ERROR', _('Password maxage'), _('Password maxage must be are natural number.'), 'shadowMax');
|
if ( !ereg('^([0-9]*)$', $this->attributes['shadowMax'][0])) $errors['shadowMax'][] = array('ERROR', _('Password maxage'), _('Password maxage must be are natural number.'));
|
||||||
if ( !ereg('^(([-][1])|([0-9]*))$', $this->attributes['shadowInactive'][0]))
|
if ( !ereg('^(([-][1])|([0-9]*))$', $this->attributes['shadowInactive'][0]))
|
||||||
$errors[] = array('ERROR', _('Password Expire'), _('Password expire must be are natural number or -1.'), 'shadowInactive');
|
$errors['shadowInactive'][] = array('ERROR', _('Password Expire'), _('Password expire must be are natural number or -1.'));
|
||||||
if ( !ereg('^([0-9]*)$', $this->attributes['shadowWarning'][0])) $errors[] = array('ERROR', _('Password warn'), _('Password warn must be are natural number.'), 'shadowWarning');
|
if ( !ereg('^([0-9]*)$', $this->attributes['shadowWarning'][0])) $errors['shadowWarning'][] = array('ERROR', _('Password warn'), _('Password warn must be are natural number.'));
|
||||||
if (is_array($errors)) return $errors;
|
if (is_array($errors)) return $errors;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue