diff options
| author | root <root@bando.(none)> | 2008-12-21 08:55:30 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-01-02 12:44:22 +0100 |
| commit | 881a3e7211c077236253e9748b9ac2dc060a4941 (patch) | |
| tree | ec7436c8d05161010358189c8964ae4cc83b406f | |
| parent | 3c2a4842ae8a0d90f131330e35e830a16283cd65 (diff) | |
| download | samba-881a3e7211c077236253e9748b9ac2dc060a4941.tar.gz samba-881a3e7211c077236253e9748b9ac2dc060a4941.tar.xz samba-881a3e7211c077236253e9748b9ac2dc060a4941.zip | |
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
(cherry picked from commit a89f7c1f82b03d23a140bdee46b9a60cb8547330)
| -rw-r--r-- | docs-xml/smbdotconf/ldap/ldapssl.xml | 4 | ||||
| -rw-r--r-- | source/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 d785071ec4c..b2e953736b2 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/source/param/loadparm.c b/source/param/loadparm.c index 8b320f1c9b2..9294ecec2a1 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -4783,7 +4783,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 */ |