From b96cad7a18f08f1c983f0a92514ca70ab4f6c1a9 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Wed, 24 Dec 2008 09:55:09 +0000 Subject: [PATCH] LEMONLDAP::NG : Status has been broken by new storage.conf capability --- build/lemonldap-ng/changelog | 10 ++++++++-- .../lib/Lemonldap/NG/Handler/SharedConf.pm | 12 ++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build/lemonldap-ng/changelog b/build/lemonldap-ng/changelog index c5eac31b5..227298426 100644 --- a/build/lemonldap-ng/changelog +++ b/build/lemonldap-ng/changelog @@ -1,13 +1,19 @@ 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 + * 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 Tue, 11 Nov 2008 16:23:19 +0100 + -- Xavier Guimard Wed, 24 Dec 2008 10:13:58 +0100 lemonldap-ng (0.9.2.2) unstable; urgency=low diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm index a2f2536f5..62340f0e5 100644 --- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm +++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm @@ -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); }