summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2009-02-06 09:41:21 +0100
committerKarolin Seeger <kseeger@samba.org>2009-02-16 09:56:56 +0100
commitd566cadbe0789deaf1d8e6b626d077dcafceb6c6 (patch)
tree91adaa840c39b32c4b3136b303962a8defcb2776 /docs-xml
parentc63bef324894e8353e6bef8b944a3d553fbcad8a (diff)
downloadsamba-d566cadbe0789deaf1d8e6b626d077dcafceb6c6.tar.gz
docs: Clarify "ldap ssl" description in man smb.conf.
Mention "ldap ssl ads". Karolin (cherry picked from commit 61f1747441ff43c1d9c99bbf69e218c1984834c7) (cherry picked from commit ba3884d4d5c55723c1989e8e3868aa7ea8db8c60)
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/smbdotconf/ldap/ldapssl.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index b2e953736b2..fa7fea94d06 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -13,9 +13,9 @@
script.</para>
<para>LDAP connections should be secured where possible. This may be
- done setting either this parameter to
+ done setting <emphasis>either</emphasis> this parameter to
<parameter moreinfo="none">Start_tls</parameter>
- or by specifying <parameter moreinfo="none">ldaps://</parameter> in
+ <emphasis>or</emphasis> 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
@@ -32,6 +32,17 @@
communicating with the directory server.</para>
</listitem>
</itemizedlist>
+ <para>
+ Please note that this parameter does only affect <emphasis>rpc</emphasis>
+ methods. To enable the LDAPv3 StartTLS extended operation (RFC2830) for
+ <emphasis>ads</emphasis>, set
+ <smbconfoption name="ldap ssl">yes</smbconfoption>
+ <emphasis>and</emphasis>
+ <smbconfoption name="ldap ssl ads">yes</smbconfoption>.
+ See <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
+ for more information on <smbconfoption name="ldap ssl ads"/>.
+ </para>
+
</description>
<value type="default">start tls</value>
</samba:parameter>