Merge branch 'master' of main:/home/e-smith/files/shares/dev/files/ipasserelle-portal

ipasserelle-portal.spec

@@ -1,8 +1,8 @@
 Summary: iPasserelle webSSO module
 %define name ipasserelle-portal
 Name: %{name}
-%define version 0.1.1
-%define release 3
+%define version 0.2.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,17 +18,15 @@ Requires: ipasserelle-userpanel
 Requires: smeserver-vacation
 Requires: smeserver-userpanels
 
-Obsoletes: ipasserelle-sso
-
 BuildRequires: e-smith-devtools
 
 %description
 Add a webSSO module based on LemonLDAP::NG
 
 %changelog
-* Fri Apr 13 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1.1-3
-- Migrate to GIT
-- Add telephoneNumber to exported variables
+* Mon Jun 18 2012 Daniel Berteaud <daniel@firewall-services.com> 0.2.0-1
+- Import in GIT
+- Don't require smeserver-mailsorting anymore
 
 * Mon Oct 24 2011 Daniel Berteaud <daniel@firewall-services.com> 0.1-3
 - Disable the password reset option in the portal

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

@@ -56,7 +56,6 @@ $conf->{'locationRules'}->{"sso-manager.$domain"} = {
 # Add default exported var
 $conf->{'exportedVars'}->{'mail'} = 'preferredMail' if ($conf->{'exportedVars'}->{'mail'} eq 'mail');
 $conf->{'exportedVars'}->{'extension'} = 'extensionNumber' unless ($conf->{'exportedVars'}->{'extension'});
-$conf->{'exportedVars'}->{'telephone'} = 'telephoneNumber' unless ($conf->{'exportedVars'}->{'telephone'});
 $conf->{'exportedVars'}->{'nom'} = 'sn' unless ($conf->{'exportedVars'}->{'nom'});
 $conf->{'exportedVars'}->{'prenom'} = 'givenName' unless ($conf->{'exportedVars'}->{'prenom'});