From 3207229b9a0181559e26717997c9a33ea96e48b6 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 28 Sep 2012 09:14:49 +0000
Subject: [PATCH] Change the configuration examples to use STARTTLS when
connecting to LDAP servers.
Thanks to Thijs Kinkhorst for providing this patch!
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3178 44740490-163a-0410-bde0-09ae8108e29a
---
config-templates/authsources.php | 2 +-
config-templates/cas-ldap.php | 4 ++--
config-templates/ldap.php | 2 +-
config-templates/ldapmulti.php | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/config-templates/authsources.php b/config-templates/authsources.php
index 87d183419..723c76978 100644
--- a/config-templates/authsources.php
+++ b/config-templates/authsources.php
@@ -228,7 +228,7 @@ $config = array(
'hostname' => 'ldap.example.org',
// Whether SSL/TLS should be used when contacting the LDAP server.
- 'enable_tls' => FALSE,
+ 'enable_tls' => TRUE,
// Whether debug output from the LDAP library should be enabled.
// Default is FALSE.
diff --git a/config-templates/cas-ldap.php b/config-templates/cas-ldap.php
index 0eba48abd..b60c71016 100644
--- a/config-templates/cas-ldap.php
+++ b/config-templates/cas-ldap.php
@@ -13,7 +13,7 @@ $casldapconfig = array (
),
'ldap' => array(
'servers' => 'idpentityid.example.org',
- 'enable_tls' => false,
+ 'enable_tls' => true,
'searchbase' => 'dc=example,dc=org',
'searchattributes' => 'uid',
'attributes' => array('cn', 'mail'),
@@ -26,7 +26,7 @@ $casldapconfig = array (
),
'ldap' => array(
'servers' => 'ldap://idpentityid2.example.org',
- 'enable_tls' => false,
+ 'enable_tls' => true,
'searchbase' => 'ou=users,dc=example,dc=org',
'searchattributes' => array('uid', 'mail'), # array for being able to login with either uid or mail.
'attributes' => null,
diff --git a/config-templates/ldap.php b/config-templates/ldap.php
index 192278eaf..5f1799ef7 100644
--- a/config-templates/ldap.php
+++ b/config-templates/ldap.php
@@ -16,7 +16,7 @@ $config = array (
'auth.ldap.dnpattern' => 'uid=%username%,dc=feide,dc=no,ou=feide,dc=uninett,dc=no',
'auth.ldap.hostname' => 'ldap.uninett.no',
'auth.ldap.attributes' => null,
- 'auth.ldap.enable_tls' => false,
+ 'auth.ldap.enable_tls' => true,
/*
* Searching the DN of the user.
diff --git a/config-templates/ldapmulti.php b/config-templates/ldapmulti.php
index f8210b49f..f09bbcac6 100644
--- a/config-templates/ldapmulti.php
+++ b/config-templates/ldapmulti.php
@@ -14,7 +14,7 @@ $ldapmulti = array (
'dnpattern' => 'uid=%username%,dc=feide,dc=no,ou=feide,dc=uninett,dc=no',
'hostname' => 'ldap.uninett.no',
'attributes' => NULL,
- 'enable_tls' => FALSE,
+ 'enable_tls' => TRUE,
'search.enable' => FALSE,
'search.base' => NULL,
'search.attributes' => NULL,
--
GitLab