New logging system
This commit is contained in:
Mercier Pierre-Olivier
parent
0c5e95b469
commit
495202128e
8 changed files with 260 additions and 165 deletions
205
utils/lpt
205
utils/lpt
|
|
@ -146,7 +146,7 @@ sub cmd_account(@)
|
|||
my $login = shift;
|
||||
|
||||
if (! $login) {
|
||||
ACU::Log::do_usage ("lpt account <login> <command> [arguments ...]");
|
||||
log(USAGE, "lpt account <login> <command> [arguments ...]");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ sub cmd_account(@)
|
|||
-sections => [ 'ACCOUNT COMMANDS' ] );
|
||||
}
|
||||
elsif (! exists $cmds_account{$subcmd}) {
|
||||
ACU::Log::do_usage ("Unknown command for account: ". $subcmd);
|
||||
log(USAGE, "Unknown command for account: ". $subcmd);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -174,7 +174,7 @@ sub cmd_account_close($@)
|
|||
my $login = shift;
|
||||
|
||||
if ($#_ > -1) {
|
||||
ACU::Log::do_usage ("<lpt> account <login> close");
|
||||
log(USAGE, "<lpt> account <login> close");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -187,14 +187,14 @@ sub cmd_account_close($@)
|
|||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) {
|
||||
ACU::Log::do_err ($mesg->error);
|
||||
log(ERROR, $mesg->error);
|
||||
}
|
||||
if ($mesg->count != 1) {
|
||||
ACU::Log::do_err ("User $login not found or multiple presence");
|
||||
log(ERROR, "User $login not found or multiple presence");
|
||||
}
|
||||
|
||||
if (grep { "epitaAccount" } $mesg->entry(0)->get_value("objectClass")) {
|
||||
ACU::Log::do_info ("Invalidating password for $login ...");
|
||||
log(INFO, "Invalidating password for $login ...");
|
||||
|
||||
my $passwd = $mesg->entry(0)->get_value("userPassword");
|
||||
$passwd =~ s/^(\{[^\}]+\})/$1!/ if ($passwd !~ /^\{[^\}]+\}!/);
|
||||
|
|
@ -206,11 +206,11 @@ sub cmd_account_close($@)
|
|||
$ldap->unbind or die ("couldn't disconnect correctly");
|
||||
|
||||
if (grep { "posixAccount" } $mesg->entry(0)->get_value("objectClass")) {
|
||||
ACU::Log::do_debug ("Setting shell for $login ...");
|
||||
log(DEBUG, "Setting shell for $login ...");
|
||||
cmd_account_shell($login, "/bin/false");
|
||||
}
|
||||
|
||||
ACU::Log::do_warn ("Done. Don't forget to restart nscd on servers and workstations!");
|
||||
log(WARN, "Done. Don't forget to restart nscd on servers and workstations!");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -224,13 +224,13 @@ sub cmd_account_create($@)
|
|||
my $login = shift;
|
||||
|
||||
if ($#_ < 3) {
|
||||
ACU::Log::do_usage ("lpt account <login> create <year> <uid> <prénom> <nom> [nopass|passgen|password]");
|
||||
log(USAGE, "lpt account <login> create <year> <uid> <prénom> <nom> [nopass|passgen|password]");
|
||||
return 1;
|
||||
}
|
||||
|
||||
my $group = shift;
|
||||
|
||||
ACU::Log::do_debug ("Adding dn: uid=$login,ou=$group,ou=users,dc=acu,dc=epita,dc=fr ...");
|
||||
log(DEBUG, "Adding dn: uid=$login,ou=$group,ou=users,dc=acu,dc=epita,dc=fr ...");
|
||||
|
||||
my $ldap = LDAP::ldap_connect();
|
||||
my $mesg = $ldap->add( "uid=$login,ou=$group,ou=users,dc=acu,dc=epita,dc=fr",
|
||||
|
|
@ -246,13 +246,13 @@ sub cmd_account_create($@)
|
|||
#$ldap->unbind or die ("couldn't disconnect correctly");
|
||||
|
||||
if ($mesg->code == 0) {
|
||||
ACU::Log::do_info("Account added: $login");
|
||||
log(INFO, "Account added: $login");
|
||||
my $pass = shift;
|
||||
return cmd_account($login, $pass) if ($pass ne "nopass");
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
ACU::Log::do_err ("Unable to add: $login: ", RESET, $mesg->error);
|
||||
log(ERROR, "Unable to add: $login: ", RESET, $mesg->error);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -266,7 +266,7 @@ sub cmd_account_grantintra($@)
|
|||
|
||||
LDAP::add_attribute($ldap, $dn, "objectClass", "intraAccount");
|
||||
|
||||
ACU::Log::do_info ("$login now grants to use the intranet.");
|
||||
log(INFO, "$login now grants to use the intranet.");
|
||||
|
||||
$ldap->unbind or die ("couldn't disconnect correctly");
|
||||
}
|
||||
|
|
@ -277,7 +277,7 @@ sub cmd_account_grantlab($@)
|
|||
my $group = shift;
|
||||
|
||||
if ($group ne "acu" && $group ne "yaka") {
|
||||
ACU::Log::do_usage ("lpt account <login> grantlab <acu|yaka>");
|
||||
log(USAGE, "lpt account <login> grantlab <acu|yaka>");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -294,7 +294,7 @@ sub cmd_account_grantlab($@)
|
|||
LDAP::add_attribute($ldap, $dn, "objectClass", "MailAccount");
|
||||
LDAP::add_attribute($ldap, $dn, "objectClass", "labAccount");
|
||||
|
||||
ACU::Log::do_info ("$login now grants to receive e-mail and connect in laboratory.");
|
||||
log(INFO, "$login now grants to receive e-mail and connect in laboratory.");
|
||||
|
||||
$ldap->unbind or die ("couldn't disconnect correctly");
|
||||
}
|
||||
|
|
@ -317,24 +317,24 @@ sub cmd_account_nopass($@)
|
|||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) {
|
||||
ACU::Log::do_err ($mesg->error);
|
||||
log(ERROR, $mesg->error);
|
||||
}
|
||||
if ($mesg->count != 1) {
|
||||
ACU::Log::do_err ("User $login not found");
|
||||
log(ERROR, "User $login not found");
|
||||
}
|
||||
|
||||
my $pass = $mesg->entry(0)->get_value("userPassword");
|
||||
|
||||
if (! $pass || $pass eq "{crypt}!toto") {
|
||||
$mesg = $ldap->unbind;
|
||||
ACU::Log::do_warn ("Password already empty");
|
||||
log(WARN, "Password already empty");
|
||||
return 2;
|
||||
}
|
||||
else {
|
||||
printf(STDERR "Are you sure you want to reset password for $login? [y/N] ");
|
||||
if (getc(STDIN) ne "y") {
|
||||
ACU::Log::do_debug ("y response expected to continue; leaving.");
|
||||
ACU::Log::do_warn ("Password unchanged for $login.");
|
||||
log(DEBUG, "y response expected to continue; leaving.");
|
||||
log(WARN, "Password unchanged for $login.");
|
||||
return 2;
|
||||
}
|
||||
|
||||
|
|
@ -345,16 +345,16 @@ sub cmd_account_nopass($@)
|
|||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) {
|
||||
ACU::Log::do_err ($mesg->error);
|
||||
log(ERROR, $mesg->error);
|
||||
}
|
||||
if ($mesg->count != 1) {
|
||||
ACU::Log::do_err ("User $login not found");
|
||||
log(ERROR, "User $login not found");
|
||||
}
|
||||
|
||||
$mesg->entry(0)->replace("userPassword" => "{crypt}!toto");
|
||||
$mesg->entry(0)->update($ldap);
|
||||
|
||||
ACU::Log::do_info ("$login have no more password.");
|
||||
log(INFO, "$login have no more password.");
|
||||
|
||||
$ldap->unbind or die ("couldn't disconnect correctly");
|
||||
|
||||
|
|
@ -368,20 +368,21 @@ sub cmd_account_passgen($@)
|
|||
my $nb_char = shift // 10;
|
||||
|
||||
if ($nb_char < 10) {
|
||||
ACU::Log::do_usage ("lpt account <login> passgen [nb_char>=10]");
|
||||
log(USAGE, "lpt account <login> passgen [nb_char>=10]");
|
||||
return 1;
|
||||
}
|
||||
|
||||
printf(STDERR "Are you sure you want to change password for $login? [y/N] ");
|
||||
my $go = <STDIN>;
|
||||
chomp $go;
|
||||
if ($go ne "y" and $go ne "yes") {
|
||||
ACU::Log::do_debug ("y response expected to continue, leaving.");
|
||||
ACU::Log::do_warn ("Password unchanged for $login.");
|
||||
return 2;
|
||||
}
|
||||
#printf(STDERR "Are you sure you want to change password for $login? [y/N] ");
|
||||
# my $go = <STDIN>;
|
||||
# chomp $go;
|
||||
# if ($go ne "y" and $go ne "yes") {
|
||||
# log(DEBUG, "y response expected to continue, leaving.");
|
||||
# log(WARN, "Password unchanged for $login.");
|
||||
# return 2;
|
||||
# }
|
||||
#
|
||||
|
||||
ACU::Log::do_debug ("Generating a $nb_char chars password...");
|
||||
log(DEBUG, "Generating a $nb_char chars password...");
|
||||
my $pass = "";
|
||||
open (HANDLE, "pwgen -s -n -c -y -1 $nb_char 1 |");
|
||||
while(<HANDLE>) {
|
||||
|
|
@ -390,7 +391,7 @@ sub cmd_account_passgen($@)
|
|||
close(HANDLE);
|
||||
chomp($pass);
|
||||
|
||||
ACU::Log::do_debug ("Setting $pass password to $login...");
|
||||
log(DEBUG, "Setting $pass password to $login...");
|
||||
if (cmd_account_password($login, $pass)) {
|
||||
return 3;
|
||||
}
|
||||
|
|
@ -405,7 +406,7 @@ sub cmd_account_password($@)
|
|||
my $login = shift;
|
||||
|
||||
if ($#_ > 0) {
|
||||
ACU::Log::do_usage ("lpt account <login> password [new_password]");
|
||||
log(USAGE, "lpt account <login> password [new_password]");
|
||||
return 1;
|
||||
}
|
||||
my $pass = shift;
|
||||
|
|
@ -419,14 +420,14 @@ sub cmd_account_password($@)
|
|||
ReadMode("restore");
|
||||
print "\n";
|
||||
|
||||
ACU::Log::do_debug ("Read passwords: $pass1 and $pass2");
|
||||
log(DEBUG, "Read passwords: $pass1 and $pass2");
|
||||
|
||||
$pass1 eq $pass2 || ACU::Log::do_err ("Passwords did not match.");
|
||||
$pass1 eq $pass2 || log(ERROR, "Passwords did not match.");
|
||||
$pass = $pass1;
|
||||
}
|
||||
|
||||
if ($pass eq "") {
|
||||
ACU::Log::do_err ("Empty password refused.");
|
||||
log(ERROR, "Empty password refused.");
|
||||
}
|
||||
|
||||
chomp($pass);
|
||||
|
|
@ -447,10 +448,10 @@ sub cmd_account_password($@)
|
|||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) {
|
||||
ACU::Log::do_err $mesg->error;
|
||||
log(ERROR, $mesg->error);
|
||||
}
|
||||
if ($mesg->count != 1) {
|
||||
ACU::Log::do_err ("User $login not found");
|
||||
log(ERROR, "User $login not found");
|
||||
}
|
||||
|
||||
$mesg->entry(0)->replace("userPassword" => $enc_password);
|
||||
|
|
@ -469,7 +470,7 @@ sub cmd_account_reopen(@)
|
|||
my $login = shift;
|
||||
|
||||
if ($#_ != -1) {
|
||||
ACU::Log::do_usage ("<lpt> account <login> reopen");
|
||||
log(USAGE, "<lpt> account <login> reopen");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -482,17 +483,17 @@ sub cmd_account_reopen(@)
|
|||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) {
|
||||
ACU::Log::do_err ($mesg->error);
|
||||
log(ERROR, $mesg->error);
|
||||
}
|
||||
if ($mesg->count != 1) {
|
||||
ACU::Log::do_err ("User $login not found or multiple presence");
|
||||
log(ERROR, "User $login not found or multiple presence");
|
||||
}
|
||||
|
||||
if (grep { "epitaAccount" } $mesg->entry(0)->get_value("objectClass")) {
|
||||
# update password
|
||||
my $passwd = $mesg->entry(0)->get_value("userPassword");
|
||||
if ($passwd =~ /^\{[^\}]+\}!/) {
|
||||
ACU::Log::do_info ("Restoring password for $login ...");
|
||||
log(INFO, "Restoring password for $login ...");
|
||||
|
||||
$passwd =~ s/^(\{[^\}]+\})!/$1/;
|
||||
|
||||
|
|
@ -504,11 +505,11 @@ sub cmd_account_reopen(@)
|
|||
$ldap->unbind or die ("couldn't disconnect correctly");
|
||||
|
||||
if (grep { "posixAccount" } $mesg->entry(0)->get_value("objectClass")) {
|
||||
ACU::Log::do_debug ("Setting shell for $login ...");
|
||||
log(DEBUG, "Setting shell for $login ...");
|
||||
cmd_account_shell($login, $shellValid);
|
||||
}
|
||||
|
||||
ACU::Log::do_warn ("Done. Don't forget to restart nscd on servers and workstations!");
|
||||
log(WARN, "Done. Don't forget to restart nscd on servers and workstations!");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -536,7 +537,7 @@ sub cmd_account_multiple_vieworchange($$$@)
|
|||
my $change = shift;
|
||||
|
||||
if (($action ne "list" and $action ne "add" and $action ne "del" and $action ne "flush") or (!$change and $action ne "list" and $action ne "flush")) {
|
||||
ACU::Log::do_usage ("<lpt> account <login> $typeName [list|add|del|flush] [string]");
|
||||
log(USAGE, "<lpt> account <login> $typeName [list|add|del|flush] [string]");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -550,14 +551,14 @@ sub cmd_account_multiple_vieworchange($$$@)
|
|||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) {
|
||||
ACU::Log::do_err ($mesg->error);
|
||||
log(ERROR, $mesg->error);
|
||||
}
|
||||
if ($mesg->count != 1) {
|
||||
ACU::Log::do_err ("User $login not found or multiple presence");
|
||||
log(ERROR, "User $login not found or multiple presence");
|
||||
}
|
||||
|
||||
if ($action eq "add") {
|
||||
ACU::Log::do_info ("Adding $change as ".$typeName."s for $login ...");
|
||||
log(INFO, "Adding $change as ".$typeName."s for $login ...");
|
||||
|
||||
my @data = $mesg->entry(0)->get_value($type);
|
||||
if (! grep(/^$change$/, @data)) {
|
||||
|
|
@ -565,42 +566,42 @@ sub cmd_account_multiple_vieworchange($$$@)
|
|||
$mesg->entry(0)->replace($type => \@data) or die $!;
|
||||
$mesg->entry(0)->update($ldap) or die $!;
|
||||
|
||||
ACU::Log::do_info ("Done!");
|
||||
log(INFO, "Done!");
|
||||
}
|
||||
else {
|
||||
ACU::Log::do_warn ("$login has already $change $typeName.");
|
||||
log(WARN, "$login has already $change $typeName.");
|
||||
}
|
||||
}
|
||||
elsif ($action eq "del") {
|
||||
ACU::Log::do_info ("Checking if $change is a ".$typeName."s of $login ...");
|
||||
log(INFO, "Checking if $change is a ".$typeName."s of $login ...");
|
||||
my @data = $mesg->entry(0)->get_value($type);
|
||||
if (grep(/^$change$/, @data)) {
|
||||
ACU::Log::do_info ("Deleting $change as $typeName for $login ...");
|
||||
log(INFO, "Deleting $change as $typeName for $login ...");
|
||||
|
||||
@data = grep(!/$change$/, @data);
|
||||
|
||||
$mesg->entry(0)->replace($type => \@data) or die $!;
|
||||
$mesg->entry(0)->update($ldap) or die $!;
|
||||
|
||||
ACU::Log::do_info ("Done!");
|
||||
log(INFO, "Done!");
|
||||
}
|
||||
else {
|
||||
ACU::Log::do_warn ("$change is not a $typeName for $login.");
|
||||
log(WARN, "$change is not a $typeName for $login.");
|
||||
}
|
||||
}
|
||||
elsif ($action eq "flush") {
|
||||
$ldap->modify($mesg->entry(0)->dn, delete => [$type]);
|
||||
ACU::Log::do_info ("$login have no more $typeName.");
|
||||
log(INFO, "$login have no more $typeName.");
|
||||
}
|
||||
else {
|
||||
if ($mesg->entry(0)->get_value($type)) {
|
||||
ACU::Log::do_info ($login."'s ".$typeName."s are:");
|
||||
log(INFO, $login."'s ".$typeName."s are:");
|
||||
for my $val ($mesg->entry(0)->get_value($type)) {
|
||||
say " - $val";
|
||||
}
|
||||
}
|
||||
else {
|
||||
ACU::Log::do_info ("$login have no $typeName.");
|
||||
log(INFO, "$login have no $typeName.");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -615,7 +616,7 @@ sub cmd_account_vieworchange($$@)
|
|||
my $login = shift;
|
||||
|
||||
if ($#_ > 0) {
|
||||
ACU::Log::do_usage ("<lpt> account <login> $typeName [new_string]");
|
||||
log(USAGE, "<lpt> account <login> $typeName [new_string]");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -632,22 +633,25 @@ sub cmd_account_vieworchange($$@)
|
|||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) {
|
||||
ACU::Log::do_err ($mesg->error);
|
||||
log(ERROR, $mesg->error);
|
||||
}
|
||||
if ($mesg->count != 1) {
|
||||
ACU::Log::do_err ("User $login not found or multiple presence");
|
||||
log(ERROR, "User $login not found or multiple presence");
|
||||
}
|
||||
|
||||
if ($change) {
|
||||
ACU::Log::do_info ("Setting $typeName to $change for $login ...");
|
||||
log(INFO, "Setting $typeName to $change for $login ...");
|
||||
|
||||
$mesg->entry(0)->replace($type => $change) or die $!;
|
||||
$mesg->entry(0)->update($ldap) or die $!;
|
||||
|
||||
ACU::Log::do_info ("Done!");
|
||||
log(INFO, "Done!");
|
||||
}
|
||||
elsif ($mesg->entry(0)->get_value($type)) {
|
||||
log(INFO, $login."'s $typeName is ".$mesg->entry(0)->get_value($type).".");
|
||||
}
|
||||
else {
|
||||
ACU::Log::do_info ($login."'s $typeName is ".$mesg->entry(0)->get_value($type).".");
|
||||
log(INFO, $login."'s has no $typeName.");
|
||||
}
|
||||
|
||||
$ldap->unbind or die ("couldn't disconnect correctly");
|
||||
|
|
@ -664,12 +668,12 @@ sub cmd_account_view($@)
|
|||
filter => "uid=$login",
|
||||
attrs => ['objectClass']);
|
||||
|
||||
$mesg->code && ACU::Log::do_err ($mesg->error);
|
||||
$mesg->code && log(ERROR, $mesg->error);
|
||||
if ($mesg->count <= 0) {
|
||||
ACU::Log::do_err ("No such account!");
|
||||
log(ERROR, "No such account!");
|
||||
}
|
||||
|
||||
ACU::Log::do_debug ("objectClasses:\t" . join(', ', $mesg->entry(0)->get_value("objectClass")));
|
||||
log(DEBUG, "objectClasses:\t" . join(', ', $mesg->entry(0)->get_value("objectClass")));
|
||||
|
||||
my @attrs = ['dn', 'ou'];
|
||||
if ($#_ >= 0) {
|
||||
|
|
@ -693,7 +697,7 @@ sub cmd_account_view($@)
|
|||
}
|
||||
}
|
||||
|
||||
ACU::Log::do_debug ("attrs to get: " . join(', ', @attrs));
|
||||
log(DEBUG, "attrs to get: " . join(', ', @attrs));
|
||||
$mesg = $ldap->search(base => "ou=users,dc=acu,dc=epita,dc=fr",
|
||||
filter => "uid=$login",
|
||||
attrs => \@attrs);
|
||||
|
|
@ -735,7 +739,7 @@ sub cmd_group(@)
|
|||
my $gname = shift;
|
||||
|
||||
if (! $gname) {
|
||||
ACU::Log::do_usage ("lpt group <group-name> <command> [arguments ...]");
|
||||
log(USAGE, "lpt group <group-name> <command> [arguments ...]");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -746,7 +750,7 @@ sub cmd_group(@)
|
|||
-sections => [ 'GROUP COMMANDS' ] );
|
||||
}
|
||||
elsif (! exists $cmds_group{$subcmd}) {
|
||||
ACU::Log::do_usage ("Unknown command for group: ". $subcmd);
|
||||
log(USAGE, "Unknown command for group: ". $subcmd);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -757,7 +761,7 @@ sub cmd_group_list(@)
|
|||
{
|
||||
if ($#ARGV > 0)
|
||||
{
|
||||
ACU::Log::do_usage ("<lpt> group list [group]");
|
||||
log(USAGE, "<lpt> group list [group]");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -807,7 +811,7 @@ sub cmd_group_add(@)
|
|||
{
|
||||
if ($#ARGV < 1)
|
||||
{
|
||||
ACU::Log::do_usage ("<lpt> group add <group> <login>");
|
||||
log(USAGE, "<lpt> group add <group> <login>");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -857,7 +861,7 @@ sub cmd_group_remove(@)
|
|||
{
|
||||
if ($#ARGV < 1)
|
||||
{
|
||||
ACU::Log::do_usage ("<lpt> group remove <group> <login>");
|
||||
log(USAGE, "<lpt> group remove <group> <login>");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -913,7 +917,7 @@ sub cmd_group_create($$)
|
|||
{
|
||||
if ($#_ != 1)
|
||||
{
|
||||
ACU::Log::do_usage ("<lpt> group create <yaka|acu> <year>");
|
||||
log(USAGE, "<lpt> group create <yaka|acu> <year>");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -928,7 +932,7 @@ sub cmd_group_create($$)
|
|||
$gid = $year - 1000;
|
||||
}
|
||||
else {
|
||||
ACU::Log::do_err ("Error: type must be acu or yaka!");
|
||||
log(ERROR, "Error: type must be acu or yaka!");
|
||||
}
|
||||
|
||||
my $ldap = LDAP::ldap_connect();
|
||||
|
|
@ -944,14 +948,14 @@ sub cmd_group_create($$)
|
|||
|
||||
$ldap->unbind or die ("couldn't disconnect correctly");
|
||||
|
||||
ACU::Log::do_info ("group added: $cn");
|
||||
log(INFO, "group added: $cn");
|
||||
}
|
||||
|
||||
sub cmd_group_delete(@)
|
||||
{
|
||||
if ($#ARGV != 1)
|
||||
{
|
||||
ACU::Log::do_usage ("<lpt> group delete <yaka|acu> <year>");
|
||||
log(USAGE, "<lpt> group delete <yaka|acu> <year>");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -976,7 +980,7 @@ sub cmd_list(@)
|
|||
-sections => [ 'LIST COMMANDS' ] );
|
||||
}
|
||||
elsif (! exists $cmds_list{$subcmd}) {
|
||||
ACU::Log::do_usage ("Unknown command for list: ". $subcmd);
|
||||
log(USAGE, "Unknown command for list: ". $subcmd);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -987,10 +991,10 @@ sub cmd_list_accounts(@)
|
|||
{
|
||||
if ($#_ > 1)
|
||||
{
|
||||
ACU::Log::do_usage ("<lpt> list account [open|close|services]");
|
||||
log(USAGE, "<lpt> list account [open|close|services]");
|
||||
exit(1);
|
||||
}
|
||||
my $action = shift;
|
||||
my $action = shift // "open";
|
||||
|
||||
my $shellFalse = "/bin/false";
|
||||
my $ldap = LDAP::ldap_connect();
|
||||
|
|
@ -1002,7 +1006,7 @@ sub cmd_list_accounts(@)
|
|||
attrs => [ 'dn', 'userPassword' ]);
|
||||
$mesg->code && die $mesg->error;
|
||||
if ($mesg->count == 0) {
|
||||
ACU::Log::do_warn ("No account found");
|
||||
log(WARN, "No account found");
|
||||
}
|
||||
else {
|
||||
for my $entry ($mesg->entries) {
|
||||
|
|
@ -1022,7 +1026,7 @@ sub cmd_list_accounts(@)
|
|||
attrs => [ 'userPassword' ]);
|
||||
$mesg->code && die $mesg->error;
|
||||
if ($mesg->count == 0) {
|
||||
ACU::Log::do_warn ("No account found");
|
||||
log(WARN, "No account found");
|
||||
}
|
||||
else {
|
||||
for my $entry ($mesg->entries) {
|
||||
|
|
@ -1044,7 +1048,7 @@ sub cmd_list_accounts(@)
|
|||
attrs => [ 'uid', 'labService' ]);
|
||||
$mesg->code && die $mesg->error;
|
||||
if ($mesg->count == 0) {
|
||||
ACU::Log::do_warn ("No account found!");
|
||||
log(WARN, "No account found!");
|
||||
}
|
||||
else {
|
||||
for my $entry ($mesg->entries) {
|
||||
|
|
@ -1119,7 +1123,7 @@ sub cmd_account_quota_set($@)
|
|||
|
||||
if ($#_ > 2)
|
||||
{
|
||||
ACU::Log::do_usage ("<lpt> account <login> quota <volume> <type> <value>");
|
||||
log(USAGE, "<lpt> account <login> quota <volume> <type> <value>");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -1129,10 +1133,10 @@ sub cmd_account_quota_set($@)
|
|||
|
||||
# check args
|
||||
if (!($volume eq "home" || $volume eq "sgoinfre")) {
|
||||
ACU::Log::do_err("Volume must be home or sgoinfre; given: $volume");
|
||||
log(ERROR, "Volume must be home or sgoinfre; given: $volume");
|
||||
}
|
||||
if (!($type eq "file" || $type eq "block")) {
|
||||
ACU::Log::do_err("Type must be file or block; given: $type");
|
||||
log(ERROR, "Type must be file or block; given: $type");
|
||||
}
|
||||
|
||||
# generate quotaName
|
||||
|
|
@ -1151,8 +1155,8 @@ sub cmd_account_quota_set($@)
|
|||
attrs => [ $quotaName ],
|
||||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) { ACU::Log::do_err($mesg->error); }
|
||||
if ($mesg->count != 1) { ACU::Log::do_err("user $login not found or multiple presence"); }
|
||||
if ($mesg->code != 0) { log(ERROR, $mesg->error); }
|
||||
if ($mesg->count != 1) { log(ERROR, "user $login not found or multiple presence"); }
|
||||
|
||||
my $old_value = $mesg->entry(0)->get_value($quotaName);
|
||||
if (!$old_value) {
|
||||
|
|
@ -1182,17 +1186,17 @@ sub cmd_account_quota_set($@)
|
|||
$value = $old_value - $t;
|
||||
}
|
||||
elsif ($value !~ /^[0-9]+$/) {
|
||||
ACU::Log::do_err ("Value must be an integer or +i or -i");
|
||||
log(ERROR, "Value must be an integer or +i or -i");
|
||||
}
|
||||
|
||||
ACU::Log::do_info ("Changing quota of $quotaName of $login to $value...");
|
||||
log(INFO, "Changing quota of $quotaName of $login to $value...");
|
||||
|
||||
$mesg->entry(0)->replace($quotaName => $value) or die $!;
|
||||
$mesg->entry(0)->update($ldap) or die $!;
|
||||
|
||||
$ldap->unbind;
|
||||
|
||||
ACU::Log::do_info ("Done!");
|
||||
log(INFO, "Done!");
|
||||
}
|
||||
|
||||
sub cmd_account_quota_sync($;$)
|
||||
|
|
@ -1209,7 +1213,7 @@ sub cmd_account_quota_sync($;$)
|
|||
'quotaSgoinfreBlock', 'quotaSgoinfreFile' ]
|
||||
);
|
||||
$mesg->code && die $mesg->error;
|
||||
$mesg->count == 1 || ACU::Log::do_err ("User $login not found or multiple presence");
|
||||
$mesg->count == 1 || log(ERROR, "User $login not found or multiple presence");
|
||||
|
||||
my $quotaHomeBlock = $mesg->entry(0)->get_value("quotaHomeBlock") // $def_quota{block}{home};
|
||||
my $quotaHomeFile = $mesg->entry(0)->get_value("quotaHomeFile") // $def_quota{file}{home};
|
||||
|
|
@ -1218,10 +1222,10 @@ sub cmd_account_quota_sync($;$)
|
|||
|
||||
if (Quota::setqlim($dev_quota{home}, $mesg->entry(0)->get_value("uidNumber"), int(0.9 * $quotaHomeBlock), $quotaHomeBlock, int(0.9 * $quotaHomeFile), $quotaHomeFile, 1, 0) == 0 and
|
||||
Quota::setqlim($dev_quota{sgoinfre}, $mesg->entry(0)->get_value("uidNumber"), int(0.9 * $quotaHomeBlock), $quotaHomeBlock, int(0.9 * $quotaHomeFile), $quotaHomeFile, 1, 0) == 0) {
|
||||
ACU::Log::do_info ($login."'s quota synchronized!");
|
||||
log(INFO, $login."'s quota synchronized!");
|
||||
}
|
||||
else {
|
||||
ACU::Log::do_err ("An error occurs during quota synchronization:");
|
||||
log(ERROR, "An error occurs during quota synchronization:");
|
||||
Quota::strerr();
|
||||
return 2;
|
||||
}
|
||||
|
|
@ -1505,18 +1509,21 @@ if ($#ARGV == -1) {
|
|||
my $cmd = shift;
|
||||
|
||||
if ($cmd eq "-v" or $cmd eq "--verbose" or $cmd eq "--debug") {
|
||||
$ACU::Log::debug = 1;
|
||||
$ACU::Log::display_level = 8;
|
||||
$cmd = shift;
|
||||
}
|
||||
elsif ($cmd eq "-f" or $cmd eq "--force") {
|
||||
$ACU::Log::verbosity = 0;
|
||||
elsif ($cmd eq "-q" or $cmd eq "--quiet") {
|
||||
$ACU::Log::display_level = 6;
|
||||
$cmd = shift;
|
||||
}
|
||||
|
||||
$ACU::Log::fatal_error = 1;
|
||||
$ACU::Log::fatal_warn = 0;
|
||||
|
||||
if (! exists $cmds{$cmd})
|
||||
{
|
||||
say BOLD, "Usage: ", RESET, "$0 ", GREEN, "command", RESET, " <arguments>";
|
||||
ACU::Log::do_err("Uknown command : $cmd");
|
||||
log(ERROR, "Uknown command : $cmd");
|
||||
}
|
||||
|
||||
exit ($cmds{$cmd}(@ARGV));
|
||||
|
|
|
|||
Reference in a new issue