Attachment 12314 Details for Bug 12023 – patch for 4.5

[patch] patch for 4.5

doc-v4-5.patch (text/plain), 1.71 KB, created by Andreas Schneider on 2016-08-05 07:12:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2016-08-05 07:12:59 UTC

Size: 1.71 KB

patch

obsolete

>From cac071999ba5aafbe3db4aa6d71c531d26222be7 Mon Sep 17 00:00:00 2001
>From: Marc Muehlfeld <mmuehlfeld@samba.org>
>Date: Sat, 16 Jul 2016 20:14:15 +0200
>Subject: [PATCH] man: Wrong option for parameter ldap ssl in smb.conf man page
>
>- "ldap ssl" does not accept the value "yes"
>- Replaced "start_tls" with "start tls".
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12023
>
>Signed-off-by: Marc Muehlfeld <mmuehlfeld@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit 976be8fe39c78acfd3c2a23302d26cc262be0ae0)
>---
> docs-xml/smbdotconf/ldap/ldapssl.xml | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
>index a50c88e..a53d726 100644
>--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
>+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
>@@ -14,7 +14,7 @@
> 
> 	<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>
>+	<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>
> 
>@@ -36,7 +36,7 @@
> 	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>
>+	<smbconfoption name="ldap ssl">start tls</smbconfoption>
> 	<emphasis>and</emphasis>
> 	<smbconfoption name="ldap ssl ads">yes</smbconfoption>.
> 	See <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
>-- 
>2.9.2
>

Flags:

kseeger: review+

Actions: View

Attachments on bug 12023: 12272 | 12314 | 12315