svn commit: samba-docs r794 - in trunk/smbdotconf/ldap: .
jht at samba.org
jht at samba.org
Wed Aug 17 16:24:08 GMT 2005
Author: jht
Date: 2005-08-17 16:24:08 +0000 (Wed, 17 Aug 2005)
New Revision: 794
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=794
Log:
Further clarification regarding ldap suffix usage.
Modified:
trunk/smbdotconf/ldap/ldapadmindn.xml
trunk/smbdotconf/ldap/ldappasswdsync.xml
trunk/smbdotconf/ldap/ldapsuffix.xml
Changeset:
Modified: trunk/smbdotconf/ldap/ldapadmindn.xml
===================================================================
--- trunk/smbdotconf/ldap/ldapadmindn.xml 2005-08-17 15:45:35 UTC (rev 793)
+++ trunk/smbdotconf/ldap/ldapadmindn.xml 2005-08-17 16:24:08 UTC (rev 794)
@@ -4,13 +4,18 @@
type="string"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para> The <smbconfoption name="ldap admin dn"/>
- defines the Distinguished Name (DN) name used by Samba to
- contact the ldap server when retreiving user account
- information. The <smbconfoption name="ldap admin dn"/> is used in conjunction with the admin dn password
- stored in the <filename moreinfo="none">private/secrets.tdb</filename> file.
- See the <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> man page for more
- information on how to accmplish this.</para>
+
+ <para>
+ The <smbconfoption name="ldap admin dn"/> defines the Distinguished Name (DN) name used by Samba to contact
+ the ldap server when retreiving user account information. The <smbconfoption name="ldap admin dn"/> is used
+ in conjunction with the admin dn password stored in the <filename moreinfo="none">private/secrets.tdb</filename>
+ file. See the <citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry>
+ man page for more information on how to accomplish this.
+ </para>
+
+ <para>
+ The <smbconfoption name="ldap admin dn"/> requires a fully specified DN. The <smbconfoption name="ldap
+ suffix"/> is not appended to the <smbconfoption name="ldap admin dn"/>.
+ </para>
</description>
</samba:parameter>
Modified: trunk/smbdotconf/ldap/ldappasswdsync.xml
===================================================================
--- trunk/smbdotconf/ldap/ldappasswdsync.xml 2005-08-17 15:45:35 UTC (rev 793)
+++ trunk/smbdotconf/ldap/ldappasswdsync.xml 2005-08-17 16:24:08 UTC (rev 794)
@@ -4,10 +4,9 @@
type="enum"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This option is used to define whether
- or not Samba should sync the LDAP password with the NT
- and LM hashes for normal accounts (NOT for
- workstation, server or domain trusts) on a password
+ <para>
+ This option is used to define whether or not Samba should sync the LDAP password with the NT
+ and LM hashes for normal accounts (NOT for workstation, server or domain trusts) on a password
change via SAMBA.
</para>
Modified: trunk/smbdotconf/ldap/ldapsuffix.xml
===================================================================
--- trunk/smbdotconf/ldap/ldapsuffix.xml 2005-08-17 15:45:35 UTC (rev 793)
+++ trunk/smbdotconf/ldap/ldapsuffix.xml 2005-08-17 16:24:08 UTC (rev 794)
@@ -4,8 +4,14 @@
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>Specifies the base for all ldap suffixes and for
- storing the sambaDomain object.</para>
+ <para>Specifies the base for all ldap suffixes and for storing the sambaDomain object.</para>
+
+ <para>
+ The ldap suffix will be appended to the values specified for the <smbconfoption name="ldap user suffix"/>,
+ <smbconfoption name="ldap group suffix"/>, <smbconfoption name="ldap machine suffix"/>, and the
+ <smbconfoption name="ldap idmap suffix"/>. Each of these should be given only a DN relative to the
+ <smbconfoption name ="ldap suffix"/>.
+ </para>
</description>
<value type="default"></value>
<value type="example">dc=samba,dc=org</value>
More information about the samba-cvs
mailing list