From: Karolin Seeger <kseeger@samba.org>
Date: Wed, 17 Dec 2008 15:18:38 +0000 (+0100)
Subject: docs: Update section "ldap ssl" in man smb.conf.
X-Git-Tag: samba-4.0.0alpha6~462^2~14^2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=580461629bb88ce3b61770e7abfe2c942a121877;p=thirdparty%2Fsamba.git

docs: Update section "ldap ssl" in man smb.conf.

Remove non-existent value "on".
Change default value to "no".
Add hint about ldaps.

Karolin
---

diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index 383a545ae27..d785071ec4c 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -12,8 +12,14 @@
 	<filename moreinfo="none">configure</filename>
 	script.</para>
 
+	<para>LDAP connections should be secured where possible. This may be
+	done setting either this parameter to
+	<parameter moreinfo="none">Start_tls</parameter>
+	or by specifying <parameter moreinfo="none">ldaps://</parameter> in
+        the URL argument of <smbconfoption name="passdb backend"/>.</para>
+
 	<para>The <smbconfoption name="ldap ssl"/> can be set to one of
-	three values:</para>
+	two values:</para>
 	<itemizedlist>
 		<listitem>
 			<para><parameter moreinfo="none">Off</parameter> = Never
@@ -25,16 +31,7 @@
 			the LDAPv3 StartTLS extended operation (RFC2830) for
 			communicating with the directory server.</para>
 		</listitem>
-
-		<listitem>
-			<para><parameter moreinfo="none">On</parameter>  = Use SSL
-			on the ldaps port when contacting the <parameter>
-			moreinfo="none">ldap server</parameter>. Only available when the
-			backwards-compatiblity <command>
-			moreinfo="none">--with-ldapsam</command> option is specified
-			to configure. See <smbconfoption name="passdb backend"/></para>.
-		</listitem>
 	</itemizedlist>
 </description>
-<value type="default">start_tls</value>
+<value type="default">no</value>
 </samba:parameter>