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

diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index d785071ec4c692e84bf80f1225f9f831ee046871..b2e953736b21bbf6006378837fb0937a5ab361d7 100644 (file)
--- 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 020eae6ad62aadd9af2d2e827c314e3aa64c5b27..8f03ae8fd73601b71937a865aa12fcab3e35d78e 100644 (file)
--- 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 */