Author: jerry Date: 2005-08-17 15:31:37 +0000 (Wed, 17 Aug 2005) New Revision: 792
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=792 Log: clarifying ldap suffix options Modified: trunk/smbdotconf/ldap/ldapgroupsuffix.xml trunk/smbdotconf/ldap/ldapidmapsuffix.xml trunk/smbdotconf/ldap/ldapmachinesuffix.xml trunk/smbdotconf/ldap/ldapsuffix.xml trunk/smbdotconf/ldap/ldapusersuffix.xml Changeset: Modified: trunk/smbdotconf/ldap/ldapgroupsuffix.xml =================================================================== --- trunk/smbdotconf/ldap/ldapgroupsuffix.xml 2005-08-15 17:40:57 UTC (rev 791) +++ trunk/smbdotconf/ldap/ldapgroupsuffix.xml 2005-08-17 15:31:37 UTC (rev 792) @@ -6,9 +6,12 @@ <description> <para>This parameters specifies the suffix that is used for groups when these are added to the LDAP directory. - If this parameter is unset, the value of <smbconfoption name="ldap suffix"/> will be used instead.</para> + If this parameter is unset, the value of <smbconfoption + name="ldap suffix"/> will be used instead. The suffix string is pre-pended to the + <smbconfoption name="ldap suffix"/> string so use a partial DN + unless the <smbconfoption name="ldap suffix"/> parameter is empty.</para> </description> <value type="default"></value> -<value type="example">ou=Groups,dc=samba,ou=Groups</value> +<value type="example">ou=Groups</value> </samba:parameter> Modified: trunk/smbdotconf/ldap/ldapidmapsuffix.xml =================================================================== --- trunk/smbdotconf/ldap/ldapidmapsuffix.xml 2005-08-15 17:40:57 UTC (rev 791) +++ trunk/smbdotconf/ldap/ldapidmapsuffix.xml 2005-08-17 15:31:37 UTC (rev 792) @@ -7,8 +7,10 @@ <para>This parameters specifies the suffix that is used when storing idmap mappings. If this parameter is unset, the value of <smbconfoption name="ldap suffix"/> - will be used instead.</para> + will be used instead. The suffix string is pre-pended to the + <smbconfoption name="ldap suffix"/> string so use a partial DN + unless the <smbconfoption name="ldap suffix"/> parameter is empty.</para> </description> <value type="default"></value> -<value type="example">ou=Idmap,dc=samba,dc=org</value> +<value type="example">ou=Idmap</value> </samba:parameter> Modified: trunk/smbdotconf/ldap/ldapmachinesuffix.xml =================================================================== --- trunk/smbdotconf/ldap/ldapmachinesuffix.xml 2005-08-15 17:40:57 UTC (rev 791) +++ trunk/smbdotconf/ldap/ldapmachinesuffix.xml 2005-08-17 15:31:37 UTC (rev 792) @@ -4,8 +4,13 @@ type="string" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";> <description> - <para>It specifies where machines should be added to the ldap tree.</para> + <para>It specifies where machines should be added to the ldap tree. + If this parameter is unset, the value of <smbconfoption + name="ldap suffix"/> will be used instead. The suffix string is pre-pended to the + <smbconfoption name="ldap suffix"/> string so use a partial DN + unless the <smbconfoption name="ldap suffix"/> parameter is empty.</para> </description> <value type="default"></value> +<value type="example">ou=Computers</value> </samba:parameter> Modified: trunk/smbdotconf/ldap/ldapsuffix.xml =================================================================== --- trunk/smbdotconf/ldap/ldapsuffix.xml 2005-08-15 17:40:57 UTC (rev 791) +++ trunk/smbdotconf/ldap/ldapsuffix.xml 2005-08-17 15:31:37 UTC (rev 792) @@ -1,13 +1,14 @@ <samba:parameter name="ldap suffix" context="G" - type="string" + type="string" advanced="1" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";> <description> <para>Specifies where user and machine accounts are added to the - tree. Can be overriden by <smbconfoption name="ldap user suffix"/> and - <smbconfoption name="ldap machine suffix"/>. It also used as the base dn for all ldap -searches. </para> + tree. Can be overriden by <smbconfoption name="ldap user suffix"/> and + <smbconfoption name="ldap machine suffix"/>. It also used as the base dn for all ldap + searches. </para> </description> <value type="default"></value> +<value type="example">dc=samba,dc=org</value> </samba:parameter> Modified: trunk/smbdotconf/ldap/ldapusersuffix.xml =================================================================== --- trunk/smbdotconf/ldap/ldapusersuffix.xml 2005-08-15 17:40:57 UTC (rev 791) +++ trunk/smbdotconf/ldap/ldapusersuffix.xml 2005-08-17 15:31:37 UTC (rev 792) @@ -1,12 +1,16 @@ <samba:parameter name="ldap user suffix" context="G" type="string" - advanced="1" developer="1" - xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";> + advanced="1" developer="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";> <description> <para>This parameter specifies where users are added to the tree. - If this parameter is not specified, the value from <smbconfoption name="ldap suffix"/>.</para> + If this parameter is unset, the value of <smbconfoption + name="ldap suffix"/> will be used instead. The suffix string is pre-pended to the + <smbconfoption name="ldap suffix"/> string so use a partial DN + unless the <smbconfoption name="ldap suffix"/> parameter is empty.</para> </description> <value type="default"/> +<value type="example">ou=people</value> </samba:parameter>
