dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Append comment

Browse Source
This commit is contained in:
Christophe Maudoux 2021-09-20 13:43:56 +02:00
parent 9b50811f5e
commit 795348f668
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
View File

@ -27,7 +27,7 @@ use Config::IniFiles;
#inherits Lemonldap::NG::Common::Conf::Backends::SOAP #inherits Lemonldap::NG::Common::Conf::Backends::SOAP
#inherits Lemonldap::NG::Common::Conf::Backends::LDAP #inherits Lemonldap::NG::Common::Conf::Backends::LDAP
our $VERSION = '2.0.12'; our $VERSION = '2.0.14';
our $msg = ''; our $msg = '';
our $iniObj; our $iniObj;
@ -107,6 +107,7 @@ sub new {
$self->{localStorage}->new( $self->{localStorageOptions} ); $self->{localStorage}->new( $self->{localStorageOptions} );
} }
} }
return $self; return $self;
} }
@ -189,6 +190,7 @@ sub getConf {
eval { $r = $self->{refLocalStorage}->get('conf') } eval { $r = $self->{refLocalStorage}->get('conf') }
if ( $> and not $args->{noCache} ); if ( $> and not $args->{noCache} );
$msg .= "Warn: $@" if ($@); $msg .= "Warn: $@" if ($@);
if ( ref($r) if ( ref($r)
and $r->{cfgNum} and $r->{cfgNum}
and $args->{cfgNum} and $args->{cfgNum}
@ -240,7 +242,11 @@ sub getConf {
return $res; return $res;
} }
# Set default values ## @method hashRef setDefault(hashRef conf, hashRef localPrm)
# Set default params
# @param $conf Lemonldap::NG configuration hashRef
# @param $localPrm Local parameters
# @return conf
sub setDefault { sub setDefault {
my ( $self, $conf, $localPrm ) = @_; my ( $self, $conf, $localPrm ) = @_;
if ( defined $localPrm ) { if ( defined $localPrm ) {
@ -414,7 +420,7 @@ sub _launch {
alarm 0; alarm 0;
die $@ if $@; die $@ if $@;
}; };
if($@) { if ($@) {
$msg .= $@; $msg .= $@;
print STDERR "MSG $msg\n"; print STDERR "MSG $msg\n";
return undef; return undef;