Partial revert of r4820^: only unused auth params are removed (#967)

environments/ppa-mbqj77/deployments/1
Xavier Guimard 10 years ago
parent 927fc64e1f
commit 292e919ec5
  1. 32
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Parser.pm

@ -960,13 +960,6 @@ sub compactConf {
my $self = shift; my $self = shift;
my $conf = $self->newConf or die("No new conf"); my $conf = $self->newConf or die("No new conf");
# Remove unused issuerDB parameters
foreach my $k ( keys %$issuerParameters ) {
unless ( $conf->{ $k . "Activation" } ) {
delete $conf->{$_} foreach ( @{ $issuerParameters->{$k} } );
}
}
# Remove unused auth parameters # Remove unused auth parameters
my %keep; my %keep;
foreach my $type (qw(authentication userDB passwordDB)) { foreach my $type (qw(authentication userDB passwordDB)) {
@ -1003,15 +996,24 @@ sub compactConf {
} }
} }
# Remove SAML service unless used # Disabled for now:
unless ( $keep{saml} or $conf->{issuerDBSAMLActivation} ) {
delete $conf->{$_} foreach (@$samlServiceParameters);
}
# Remove OpenIF-Connect service unless used ## Remove unused issuerDB parameters
unless ( $keep{oidc} or $conf->{issuerDBOpenIDConnectActivation} ) { #foreach my $k ( keys %$issuerParameters ) {
delete $conf->{$_} foreach (@$oidcServiceParameters); # unless ( $conf->{ $k . "Activation" } ) {
} # delete $conf->{$_} foreach ( @{ $issuerParameters->{$k} } );
# }
#}
## Remove SAML service unless used
#unless ( $keep{saml} or $conf->{issuerDBSAMLActivation} ) {
# delete $conf->{$_} foreach (@$samlServiceParameters);
#}
## Remove OpenIF-Connect service unless used
#unless ( $keep{oidc} or $conf->{issuerDBOpenIDConnectActivation} ) {
# delete $conf->{$_} foreach (@$oidcServiceParameters);
#}
} }
1; 1;

Loading…
Cancel
Save