Spec file update

As the module specific ones are not available for HTTP headers

ipasserelle-portal.spec

@@ -1,11 +1,11 @@
 Summary: iPasserelle webSSO module
 %define name ipasserelle-portal
 Name: %{name}
-%define version 0.2.4
+%define version 0.2.8
 %define release 1
 Version: %{version}
 Release: %{release}%{?dist}
-License: GPL
+License: GPLv2+
 URL: http://www.ipasserelle-.com/
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
@@ -24,6 +24,18 @@ BuildRequires: e-smith-devtools
 Add a webSSO module based on LemonLDAP::NG
 
 %changelog
+* Wed Feb 11 2015 Daniel Berteaud <daniel@firewall-services.com> 0.2.8-1
+- Make sure mail var is set
+
+* Wed Feb 11 2015 Daniel Berteaud <daniel@firewall-services.com> 0.2.7-1
+- exported vars are back in the global scope
+
+* Tue Sep 2 2014 Daniel Berteaud <daniel@firewall-services.com> 0.2.6-1
+- Update exportedVars from LDAP for Lemonldap::NG 1.4
+
+* Thu Feb 13 2014 Daniel Berteaud <daniel@firewall-services.com> 0.2.5-1
+- Fix URL for hatch.gif and lock.png in CSS
+
 * Wed Sep 11 2013 Daniel Berteaud <daniel@firewall-services.com> 0.2.4-1
 - Add iPasserelle skin for LL::NG
 

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

@@ -55,11 +55,16 @@ $conf->{'locationRules'}->{"sso-manager.$domain"} = {
 } unless ($conf->{'locationRules'}->{"sso-manager.$domain"});
 
 # Add default exported var
-$conf->{'exportedVars'}->{'mail'} = 'preferredMail' if ($conf->{'exportedVars'}->{'mail'} eq 'mail');
+$conf->{'exportedVars'}->{'mail'} = 'preferredMail' if (!$conf->{'exportedVars'}->{'mail'} || $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 ldapExportedVars which conflicts with exportedVars
+foreach my $var (qw(mail nom prenom extension)){
+  delete $conf->{'ldapExportedVars'}->{$var} if ($conf->{'ldapExportedVars'}->{$var} && $conf->{'exportedVars'}->{$var});
+}
+
 # Initialize a random key
 $conf->{'key'} = join( '', map { chr( int( rand(94) ) + 33 ) } ( 1 .. 16 ) ) unless ($conf->{'key'});