summaryrefslogtreecommitdiff
path: root/docs/docbook
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-05-17 11:10:34 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-05-17 11:10:34 +0000
commita64932dfc06af46d4a4eebd6fb537e229466b00b (patch)
treea9e173f5d4d1973359b1446f8cba8932c154ac00 /docs/docbook
parentdf27d48e0083bfe54b971610d1e24ad2e3a1693c (diff)
downloadsamba-a64932dfc06af46d4a4eebd6fb537e229466b00b.tar.gz
samba-a64932dfc06af46d4a4eebd6fb537e229466b00b.tar.bz2
samba-a64932dfc06af46d4a4eebd6fb537e229466b00b.zip
Update the doco for the LDAP options in smb.conf, in line with code changes
a little while back. We might have to look at the migration path for these options. (or as --with-ldap has always been 'experimental' we could ignore it...) Andrew Bartlett (This used to be commit 35e909b33870f6c5d8af9398d6f9f816e83e2ca4)
Diffstat (limited to 'docs/docbook')
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml72
1 files changed, 29 insertions, 43 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index e8846e4b26..ba4495e34f 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -644,10 +644,10 @@
<listitem><para><link linkend="LDAPADMINDN"><parameter>ldap admin dn</parameter></link></para></listitem>
<listitem><para><link linkend="LDAPFILTER"><parameter>ldap filter</parameter></link></para></listitem>
- <listitem><para><link linkend="LDAPPORT"><parameter>ldap port</parameter></link></para></listitem>
- <listitem><para><link linkend="LDAPSERVER"><parameter>ldap server</parameter></link></para></listitem>
<listitem><para><link linkend="LDAPSSL"><parameter>ldap ssl</parameter></link></para></listitem>
<listitem><para><link linkend="LDAPSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
+ <listitem><para><link linkend="LDAPUSERSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
+ <listitem><para><link linkend="LDAPMACHINESUFFIX"><parameter>ldap suffix</parameter></link></para></listitem>
<listitem><para><link linkend="LMANNOUNCE"><parameter>lm announce</parameter></link></para></listitem>
<listitem><para><link linkend="LMINTERVAL"><parameter>lm interval</parameter></link></para></listitem>
@@ -3375,10 +3375,8 @@
</varlistentry>
-
-
<varlistentry>
- <term><anchor id="LDAPPORT">ldap port (G)</term>
+ <term><anchor id="LDAPSSL">ldap ssl (G)</term>
<listitem><para>This parameter is only available if Samba has been
configure to include the <command>--with-ldapsam</command> option
at compile time. This option should be considered experimental and
@@ -3386,15 +3384,25 @@
</para>
<para>
- This option is used to control the tcp port number used to contact
- the <link linkend="LDAPSERVER"><parameter>ldap server</parameter></link>.
- The default is to use the stand LDAPS port 636.
+ This option is used to define whether or not Samba should
+ use SSL when connecting to the <link linkend="LDAPSERVER"><parameter>ldap
+ server</parameter></link>. This is <emphasis>NOT</emphasis> related to
+ Samba SSL support which is enabled by specifying the
+ <command>--with-ssl</command> option to the <filename>configure</filename>
+ script (see <link linkend="SSL"><parameter>ssl</parameter></link>).
</para>
-
- <para>See Also: <link linkend="LDAPSSL">ldap ssl</link>
+
+ <para>
+ The <parameter>ldap ssl</parameter> can be set to one of three values:
+ (a) <constant>on</constant> - Always use SSL when contacting the
+ <parameter>ldap server</parameter>, (b) <constant>off</constant> -
+ Never use SSL when querying the directory, or (c) <constant>start_tls</constant>
+ - Use the LDAPv3 StartTLS extended operation
+ (RFC2830) for communicating with the directory server.
</para>
- <para>Default : <command>ldap port = 636</command></para>
+
+ <para>Default : <command>ldap ssl = on</command></para>
</listitem>
</varlistentry>
@@ -3402,67 +3410,45 @@
<varlistentry>
- <term><anchor id="LDAPSERVER">ldap server (G)</term>
+ <term><anchor id="LDAPSUFFIX">ldap suffix (G)</term>
<listitem><para>This parameter is only available if Samba has been
configure to include the <command>--with-ldapsam</command> option
at compile time. This option should be considered experimental and
under active development.
</para>
- <para>
- This parameter should contains the FQDN of the ldap directory
- server which should be queried to locate user account information.
- </para>
-
- <para>Default : <command>ldap server = localhost</command></para>
+ <para>Default : <emphasis>none</emphasis></para>
</listitem>
</varlistentry>
-
<varlistentry>
- <term><anchor id="LDAPSSL">ldap ssl (G)</term>
+ <term><anchor id="LDAPUSERSUFFIX">ldap user suffix (G)</term>
<listitem><para>This parameter is only available if Samba has been
configure to include the <command>--with-ldapsam</command> option
at compile time. This option should be considered experimental and
- under active development.
- </para>
-
- <para>
- This option is used to define whether or not Samba should
- use SSL when connecting to the <link linkend="LDAPSERVER"><parameter>ldap
- server</parameter></link>. This is <emphasis>NOT</emphasis> related to
- Samba SSL support which is enabled by specifying the
- <command>--with-ssl</command> option to the <filename>configure</filename>
- script (see <link linkend="SSL"><parameter>ssl</parameter></link>).
- </para>
-
- <para>
- The <parameter>ldap ssl</parameter> can be set to one of three values:
- (a) <constant>on</constant> - Always use SSL when contacting the
- <parameter>ldap server</parameter>, (b) <constant>off</constant> -
- Never use SSL when querying the directory, or (c) <constant>start_tls</constant>
- - Use the LDAPv3 StartTLS extended operation
- (RFC2830) for communicating with the directory server.
+ under active development. It specified where users are added to the
+ tree.
</para>
+
- <para>Default : <command>ldap ssl = on</command></para>
+ <para>Default : <emphasis>none</emphasis></para>
</listitem>
</varlistentry>
-
<varlistentry>
- <term><anchor id="LDAPSUFFIX">ldap suffix (G)</term>
+ <term><anchor id="LDAPSUFFIX">ldap machine suffix (G)</term>
<listitem><para>This parameter is only available if Samba has been
configure to include the <command>--with-ldapsam</command> option
at compile time. This option should be considered experimental and
- under active development.
+ under active development. It specifies where machines should be
+ added to the ldap tree.
</para>