From cf9f2484b70f5b21f0020800ff0f36d49d18b175 Mon Sep 17 00:00:00 2001
From: root <root@bando.(none)>
Date: Sun, 21 Dec 2008 08:55:30 +0100
Subject: s3:loadparm/docs: Set default for "ldap ssl" to "start tls".

This has been discussed on samba-technical before.
3.3 and newer only!

Karolin
---
 docs-xml/smbdotconf/ldap/ldapssl.xml | 4 ++--
 source3/param/loadparm.c             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index d785071ec4..b2e953736b 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -27,11 +27,11 @@
 		</listitem>
 
 		<listitem>
-			<para><parameter moreinfo="none">Start_tls</parameter> = Use
+			<para><parameter moreinfo="none">start tls</parameter> = Use
 			the LDAPv3 StartTLS extended operation (RFC2830) for
 			communicating with the directory server.</para>
 		</listitem>
 	</itemizedlist>
 </description>
-<value type="default">no</value>
+<value type="default">start tls</value>
 </samba:parameter>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 020eae6ad6..8f03ae8fd7 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4879,7 +4879,7 @@ static void init_globals(bool first_time_only)
 	string_set(&Globals.szLdapIdmapSuffix, "");
 
 	string_set(&Globals.szLdapAdminDn, "");
-	Globals.ldap_ssl = LDAP_SSL_OFF;
+	Globals.ldap_ssl = LDAP_SSL_START_TLS;
 	Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
 	Globals.ldap_delete_dn = False;
 	Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
-- 
cgit