Part back to 3466: Attributes.pm is not github version

environments/ppa-mbqj77/deployments/1
Xavier Guimard 10 years ago
parent 26ad70cdca
commit fc6c64d6f3
  1. 8
      lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf.pm
  2. 2
      lemonldap-ng-handler/t/10-Lemonldap-NG-Handler-SharedConf.t

@ -177,14 +177,12 @@ sub getConf {
# Adapt some values before storing in local cache
# Get default values
my $confAttributes =
Lemonldap::NG::Common::Conf::Attributes->attributes();
Lemonldap::NG::Common::Conf::Attributes->new();
my @attributes =
grep { defined $confAttributes->{$_}->{default} }
keys %$confAttributes;
my @attributes = $confAttributes->meta()->get_attribute_list();
foreach my $name (@attributes) {
$r->{$name} //= $confAttributes->{$name}->{default};
$r->{$name} //= $confAttributes->$name;
}
# Convert old option useXForwardedForIP into trustedProxies

@ -42,7 +42,7 @@ $ini->flush();
use Env qw(LLNG_DEFAULTCONFFILE);
$LLNG_DEFAULTCONFFILE = $ini->filename;
open STDERR, '>/dev/null';
#open STDERR, '>/dev/null';
#########################

Loading…
Cancel
Save