Adding upstream version 2:4.17.12+dfsg.upstream/2%4.17.12+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 42 insertions, 0 deletions

diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
new file mode 100644
index 0000000..5fe67b1
--- /dev/null
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -0,0 +1,42 @@
+<samba:parameter name="ldap ssl"
+                 context="G"
+                 type="enum"
+                 enumlist="enum_ldap_ssl"
+                 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
+	This is <emphasis>NOT</emphasis> related to
+	Samba's previous SSL support which was enabled by specifying the
+	<command moreinfo="none">--with-ssl</command> option to the
+	<filename moreinfo="none">configure</filename>
+	script.</para>
+
+	<para>LDAP connections should be secured where possible. This may be
+	done setting <emphasis>either</emphasis> this parameter to
+	<parameter moreinfo="none">start tls</parameter> 
+	<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
+	two values:</para>
+	<itemizedlist>
+		<listitem>
+			<para><parameter moreinfo="none">Off</parameter> = Never
+			use SSL when querying the directory.</para>
+		</listitem>
+
+		<listitem>
+			<para><parameter moreinfo="none">start tls</parameter> = Use
+			the LDAPv3 StartTLS extended operation (RFC2830) for
+			communicating with the directory server.</para>
+		</listitem>
+	</itemizedlist>
+	<para>
+	Please note that this parameter does only affect <emphasis>rpc</emphasis>
+	methods.
+        </para>
+
+</description>
+<value type="default">start tls</value>
+</samba:parameter>