diff options
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/htmldocs.html | 8 | ||||
| -rw-r--r-- | docs-xml/manpages-3/idmap_hash.8.xml | 2 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/ldap/ldapssl.xml | 37 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/ldap/ldaptimeout.xml | 4 |
4 files changed, 22 insertions, 29 deletions
diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index d2be5effa9..44fcc0f289 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,19 +23,15 @@ <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td> </tr> <tr> - <td valign="top"><a href="../using_samba/toc.html">Using Samba</a>, 2nd Edition</td> + <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td> <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td> </tr> <tr> - <td valign="top"><a href="manpages-3/index.html">Man pages</a></td> + <td valign="top"><a href="manpages/index.html">Man pages</a></td> <td valign="top">The Samba man pages in HTML.</td> </tr> <tr> <td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td> <td valign="top">Samba Release Notes.</td> </tr> -<tr> - <td valign="top"><a href="../../README.VENDOR">README.VENDOR</a></td> - <td valign="top">VENDOR specific information.</td> -</tr> </table></body></html> diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages-3/idmap_hash.8.xml index 8e452b3c89..fbafd71627 100644 --- a/docs-xml/manpages-3/idmap_hash.8.xml +++ b/docs-xml/manpages-3/idmap_hash.8.xml @@ -37,7 +37,7 @@ Specifies the absolute path to the name mapping file used by the nss_info API. Entries in the file are of the form "<replaceable>unix name</replaceable> - = <replaceable>qualified domain name</replaceable>"e;. + = <replaceable>qualified domain name</replaceable>". Mapping of both user and group names is supported. </para></listitem> </varlistentry> diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml index 39ed08fe82..d785071ec4 100644 --- a/docs-xml/smbdotconf/ldap/ldapssl.xml +++ b/docs-xml/smbdotconf/ldap/ldapssl.xml @@ -3,36 +3,35 @@ 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>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> 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> |