koozali
/
ipasserelle-portal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set exported variables in the global scope only 

As the module specific ones are not available for HTTP headers
This commit is contained in:
Daniel Berteaud 2015-02-11 11:59:36 +01:00
parent 00d6eab43d
commit d09770c847
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
root/etc/e-smith/templates/var/lib/lemonldap-ng/conf/lmConf/007default
View File

@ -55,14 +55,14 @@ $conf->{'locationRules'}->{"sso-manager.$domain"} = {
} unless ($conf->{'locationRules'}->{"sso-manager.$domain"});
# Add default exported var
$conf->{'ldapExportedVars'}->{'mail'} = 'preferredMail' if ($conf->{'ldapExportedVars'}->{'mail'} eq 'mail');
$conf->{'ldapExportedVars'}->{'extension'} = 'extensionNumber' unless ($conf->{'ldapExportedVars'}->{'extension'});
$conf->{'ldapExportedVars'}->{'nom'} = 'sn' unless ($conf->{'ldapExportedVars'}->{'nom'});
$conf->{'ldapExportedVars'}->{'prenom'} = 'givenName' unless ($conf->{'ldapExportedVars'}->{'prenom'});
$conf->{'exportedVars'}->{'mail'} = 'preferredMail' if ($conf->{'exportedVars'}->{'mail'} eq 'mail');
$conf->{'exportedVars'}->{'extension'} = 'extensionNumber' unless ($conf->{'exportedVars'}->{'extension'});
$conf->{'exportedVars'}->{'nom'} = 'sn' unless ($conf->{'exportedVars'}->{'nom'});
$conf->{'exportedVars'}->{'prenom'} = 'givenName' unless ($conf->{'exportedVars'}->{'prenom'});
# Remove obsolete exportedVars
# Remove ldapExportedVars which conflicts with exportedVars
foreach my $var (qw(mail nom prenom extension)){
delete $conf->{'exportedVars'}->{$var} if $conf->{'exportedVars'}->{$var};
delete $conf->{'ldapExportedVars'}->{$var} if ($conf->{'ldapExportedVars'}->{$var} && $conf->{'exportedVars'}->{$var});
}
# Initialize a random key