From 38aa3c612b08bcad893913d8ddd46a6a7ea894f5 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Tue, 7 Oct 2014 15:19:41 +0200
Subject: [PATCH] dicos/99_one-frontend.xml: Calcul de la valeur de
 activer_client_ldap en fonction de la variable d'authentification
 "sunstone_auth_modes"

fixes #9144 @2h
---
 dicos/99_one-frontend.xml    | 12 ++++++++++--
 tmpl/sunstone-ldap_auth.conf |  2 +-
 tmpl/sunstone-server.conf    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml
index afd5021..762c457 100644
--- a/dicos/99_one-frontend.xml
+++ b/dicos/99_one-frontend.xml
@@ -27,7 +27,7 @@
             <variable name='langue_sunstone' type='string' description="Langue par défaut de l'interface" mode='expert'>
                 <value>fr_FR</value>
             </variable>
-            <variable name='sunstone_auth_modes' type='string' description="Modes supplémentaires d'authentification des utilisateurs" mode='expert' multi='True' />
+            <variable name='sunstone_auth_modes' type='string' description="Modes supplémentaires d'authentification des utilisateurs" mode='expert'/>
         </family>
     </variables>
 
@@ -36,8 +36,16 @@
             <param type='eole' name='valeur'>adresse_ip_eth0</param>
         </fill>
         <check name='valid_enum' target='sunstone_auth_modes'>
-            <param>['ldap']</param>
+            <param>['', 'ldap']</param>
         </check>
+          
+        <auto name='calc_multi_condition' target='activer_client_ldap'>
+          <param>ldap</param>
+          <param type='eole' name='condition_1'>sunstone_auth_modes</param>
+          <param name='match'>distant</param>
+          <param name='mismatch'>non</param>
+        </auto>
+
         <condition name='disabled_if_in' source='activer_onefrontend'>
             <param>non</param>
             <!--target type='filelist'>onefrontend</target-->
diff --git a/tmpl/sunstone-ldap_auth.conf b/tmpl/sunstone-ldap_auth.conf
index 9929e54..2644da5 100644
--- a/tmpl/sunstone-ldap_auth.conf
+++ b/tmpl/sunstone-ldap_auth.conf
@@ -1,4 +1,4 @@
-%if 'ldap' in %%getVar('sunstone_auth_modes')
+%if %%getVar('sunstone_auth_modes', None) == 'ldap'
 server 1:
     # Ldap user able to query, if not set connects as anonymous. For
     # Active Directory append the domain name. Example:
diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf
index cb2627e..c4002d7 100644
--- a/tmpl/sunstone-server.conf
+++ b/tmpl/sunstone-server.conf
@@ -65,7 +65,7 @@
 #   driver defined for the user
 #
 #:auth: sunstone
-%if %%getVar('sunstone_auth_modes', []) == []
+%if %%getVar('sunstone_auth_modes', None)
 :auth: sunstone
 %else
 :auth: opennebula