Changeset 232 for branches/samba-3.2.x/docs-xml/smbdotconf/ldap

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

Location:

branches/samba-3.2.x/docs-xml/smbdotconf/ldap

Files:

• ldapssl.xml (modified) (1 diff)
• ldaptimeout.xml (modified) (1 diff)

branches/samba-3.2.x/docs-xml/smbdotconf/ldap/ldapssl.xml

@@ -4 +4 @@
                  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>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
+        two 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 
-                        moreinfo="none">--with-ldapsam</command> option is specified
-                to configure. See <smbconfoption name="passdb backend"/></para>.
-                </listitem>
-        </itemizedlist>         
+        </itemizedlist>
 </description>
-<value type="default">start_tls</value>
+<value type="default">no</value>
 </samba:parameter>

branches/samba-3.2.x/docs-xml/smbdotconf/ldap/ldaptimeout.xml

@@ -6 +6 @@
 <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>