From 620027778174e33df9675f536f5f71c31065aa24 Mon Sep 17 00:00:00 2001
From: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
Date: Tue, 4 Apr 2017 15:38:24 +0200
Subject: [PATCH] LDAP with TLS authentication does not work

* tmpl/sunstone-ldap_auth.conf: Fix TLS configuration, authentication
  method is always simple unless we use SASL.

Ref: #20060
---
 tmpl/sunstone-ldap_auth.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tmpl/sunstone-ldap_auth.conf b/tmpl/sunstone-ldap_auth.conf
index 766549c..8bec695 100644
--- a/tmpl/sunstone-ldap_auth.conf
+++ b/tmpl/sunstone-ldap_auth.conf
@@ -7,14 +7,16 @@ server 1:
     #:password: 'password'
 
     # Ldap authentication method
+    :auth_method: :simple
 
     # Ldap server
     :host: %%adresse_ip_ldap
 %if %%getVar('ldap_tls', 'non') == 'oui'
-    :auth_method: :simple_tls
     :port: 636
+
+    # Uncomment this line for tls conections
+    :encryption: :simple_tls
 %else
-    :auth_method: :simple
     :port: 389
 %end if