Commit b96cad7a authored by Xavier Guimard's avatar Xavier Guimard

LEMONLDAP::NG : Status has been broken by new storage.conf capability

parent 2449e92c
lemonldap-ng (0.9.3) unstable; urgency=low
[ Clement Oudot ]
* New menu and skin (pastel)
* New menu and skin (pastel). Menu calculates rights before displaying URL
[ Xavier Guimard ]
* Authentication and UserDB separation
* New session explorer system
-- Xavier Guimard <x.guimard@free.fr> Tue, 11 Nov 2008 16:23:19 +0100
* Backport of debian storage.conf file to normal installation
* Errors are now displayed in the browser for portal and manager
* Custom functions for rules, macros, headers and groups
* Manager protection
* New configuration access with local cache system
* AuthBasic handler
-- Xavier Guimard <x.guimard@free.fr> Wed, 24 Dec 2008 10:13:58 +0100
lemonldap-ng (0.9.2.2) unstable; urgency=low
......
......@@ -43,12 +43,6 @@ BEGIN {
sub init($$) {
my ( $class, $args ) = @_;
$reloadTime = $args->{reloadTime} || 600;
# localStorage can be declared in configStorage or at the root or both
foreach (qw(localStorage localStorageOptions)) {
$args->{$_} ||= $args->{configStorage}->{$_};
$args->{configStorage}->{$_} ||= $args->{$_};
}
$localConfig = $args;
$class->localInit($args);
}
......@@ -66,6 +60,12 @@ sub localInit {
my ( $class, $args ) = @_;
die("$class : unable to build configuration : $Lemonldap::NG::Common::Conf::msg")
unless($lmConf = Lemonldap::NG::Common::Conf->new( $args->{configStorage} ));
# localStorage can be declared in configStorage or at the root or both
foreach (qw(localStorage localStorageOptions)) {
$args->{$_} ||= $args->{configStorage}->{$_} || $lmConf->{$_};
$args->{configStorage}->{$_} ||= $args->{$_};
}
$class->defaultValuesInit($args);
$class->SUPER::localInit($args);
}
......
Markdown is supported
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