diff options
Diffstat (limited to 'docs-xml/smbdotconf')
| -rw-r--r-- | docs-xml/smbdotconf/ldap/ldapssl.xml | 15 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/ldap/ldapsslads.xml | 21 |
2 files changed, 34 insertions, 2 deletions
diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml index b2e953736b..fa7fea94d0 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> diff --git a/docs-xml/smbdotconf/ldap/ldapsslads.xml b/docs-xml/smbdotconf/ldap/ldapsslads.xml new file mode 100644 index 0000000000..e6998cbaf2 --- /dev/null +++ b/docs-xml/smbdotconf/ldap/ldapsslads.xml @@ -0,0 +1,21 @@ +<samba:parameter name="ldap ssl ads" + context="G" + type="boolean" + advanced="1" developer="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> +<description> + <para>This option is used to define whether or not Samba should + use SSL when connecting to the ldap server using + <emphasis>ads</emphasis> methods. + Rpc methods are not affected by this parameter. Please note, that + this parameter won't have any effect if <smbconfoption name="ldap ssl"/> + is set to <parameter>no</parameter>. + </para> + + <para>See <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum> + for more information on <smbconfoption name="ldap ssl"/>. + </para> + +</description> +<value type="default">no</value> +</samba:parameter> |