Commit 8d052624 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes: #2973 Less verbose dies

parent c2701443
...@@ -38,6 +38,8 @@ use File::Path; ...@@ -38,6 +38,8 @@ use File::Path;
my $iptool = "ifconfig"; my $iptool = "ifconfig";
my $die_endl = "\n"; # Change to "" to have verbose dies
BEGIN BEGIN
{ {
use Exporter (); use Exporter ();
...@@ -684,7 +686,7 @@ sub argonaut_get_generic_settings { ...@@ -684,7 +686,7 @@ sub argonaut_get_generic_settings {
my $ldapinfos = argonaut_ldap_init ($ldap_configfile, 0, $ldap_dn, 0, $ldap_password); my $ldapinfos = argonaut_ldap_init ($ldap_configfile, 0, $ldap_dn, 0, $ldap_password);
if ( $ldapinfos->{'ERROR'} > 0) { if ( $ldapinfos->{'ERROR'} > 0) {
die $ldapinfos->{'ERRORMSG'}."\n"; die $ldapinfos->{'ERRORMSG'}."$die_endl";
} }
my ($ldap,$ldap_base) = ($ldapinfos->{'HANDLE'},$ldapinfos->{'BASE'}); my ($ldap,$ldap_base) = ($ldapinfos->{'HANDLE'},$ldapinfos->{'BASE'});
...@@ -717,7 +719,7 @@ sub argonaut_get_generic_settings { ...@@ -717,7 +719,7 @@ sub argonaut_get_generic_settings {
return $settings; return $settings;
} elsif(scalar($mesg->entries)==0) { } elsif(scalar($mesg->entries)==0) {
unless ($inheritance) { unless ($inheritance) {
die "This computer ($ip) is not configured in LDAP to run this module (missing service $objectClass)."; die "This computer ($ip) is not configured in LDAP to run this module (missing service $objectClass).$die_endl";
} }
$mesg = $ldap->search( # perform a search $mesg = $ldap->search( # perform a search
base => $ldap_base, base => $ldap_base,
...@@ -725,9 +727,9 @@ sub argonaut_get_generic_settings { ...@@ -725,9 +727,9 @@ sub argonaut_get_generic_settings {
attrs => [ 'dn', 'macAddress', 'gotoMode' ] attrs => [ 'dn', 'macAddress', 'gotoMode' ]
); );
if (scalar($mesg->entries)>1) { if (scalar($mesg->entries)>1) {
die "Several computers are associated to IP $ip."; die "Several computers are associated to IP $ip.$die_endl";
} elsif (scalar($mesg->entries)<1) { } elsif (scalar($mesg->entries)<1) {
die "There is no computer associated to IP $ip."; die "There is no computer associated to IP $ip.$die_endl";
} }
$settings->{'dn'} = ($mesg->entries)[0]->dn(); $settings->{'dn'} = ($mesg->entries)[0]->dn();
$settings->{'mac'} = ($mesg->entries)[0]->get_value("macAddress"); $settings->{'mac'} = ($mesg->entries)[0]->get_value("macAddress");
...@@ -752,10 +754,10 @@ sub argonaut_get_generic_settings { ...@@ -752,10 +754,10 @@ sub argonaut_get_generic_settings {
} }
return $settings; return $settings;
} else { } else {
die "This computer ($ip) is not configured in LDAP to run this module (missing service $objectClass)."; die "This computer ($ip) is not configured in LDAP to run this module (missing service $objectClass).$die_endl";
} }
} else { } else {
die "Several computers are associated to IP $ip."; die "Several computers are associated to IP $ip.$die_endl";
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment