From 6ac36698e975649d26e3f2975c2101129c3ffe97 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Wed, 17 Dec 2008 15:42:12 +0100
Subject: docs: Fix some formatting issues in the "ldap ssl" section of man
 smb.conf.

Karolin
---
 docs-xml/smbdotconf/ldap/ldapssl.xml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'docs-xml/smbdotconf')

diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index 39ed08fe82..383a545ae2 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -3,36 +3,38 @@
 				 type="enum"
                  advanced="1" developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
- <description>
+<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> 
+	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>The <smbconfoption name="ldap ssl"/> can be set to one of three values:</para>	
+
+	<para>The <smbconfoption name="ldap ssl"/> can be set to one of
+	three values:</para>
 	<itemizedlist>
 		<listitem>
-			<para><parameter moreinfo="none">Off</parameter> = Never 
+			<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 
+			<para><parameter moreinfo="none">Start_tls</parameter> = Use
+			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 
+			<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>.
+			to configure. See <smbconfoption name="passdb backend"/></para>.
 		</listitem>
-	</itemizedlist>		
+	</itemizedlist>
 </description>
 <value type="default">start_tls</value>
 </samba:parameter>
-- 
cgit 


From 580461629bb88ce3b61770e7abfe2c942a121877 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Wed, 17 Dec 2008 16:18:38 +0100
Subject: docs: Update section "ldap ssl" in man smb.conf.

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

Karolin
---
 docs-xml/smbdotconf/ldap/ldapssl.xml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'docs-xml/smbdotconf')

diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index 383a545ae2..d785071ec4 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>
-- 
cgit 


From 1aff97bc48844afba5de48447fdcdcc02d163a97 Mon Sep 17 00:00:00 2001
From: Björn Jacke <bj@sernet.de>
Date: Fri, 19 Dec 2008 12:12:59 +0100
Subject: correct the description of the "ldap timeout" parameter

---
 docs-xml/smbdotconf/ldap/ldaptimeout.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'docs-xml/smbdotconf')

diff --git a/docs-xml/smbdotconf/ldap/ldaptimeout.xml b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
index 9c34ac8bec..5bc2699d00 100644
--- a/docs-xml/smbdotconf/ldap/ldaptimeout.xml
+++ b/docs-xml/smbdotconf/ldap/ldaptimeout.xml
@@ -5,9 +5,7 @@
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 	<para>
-	When Samba connects to an ldap server that server may be down or unreachable. To prevent Samba from hanging whilst
-	waiting for the connection this parameter specifies in seconds how long Samba should wait before failing the 
-	connect. The default is to only wait fifteen seconds for the ldap server to respond to the connect request.
+	This parameter defines the number of seconds that Samba should use as timeout for LDAP operations.
 	</para>
 </description>
 <value type="default">15</value>
-- 
cgit