Fixes and updates.

(This used to be commit 9923009479a405cdfb46a10eae8256b745863cea)

3 files changed, 18 insertions, 6 deletions

diff --git a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
index f7a4daa117..658a0f42d0 100644
--- a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml
@@ -955,6 +955,18 @@ modifyTimestamp: 20031227004338Z
 		implement additional slave LDAP servers as required.
 		</para></step>
 
+		<step><para>
+		On each machine (PDC and BDCs) after the respective &smb.conf; files have been created as shown in
+		<link linkend="ch7-massmbconfA">Primary Domain Controller &smb.conf; File &smbmdash; Part A + B + C</link> and
+		on BDCs the <link linkend="ch7-slvsmbocnfA">Backup Domain Controller &smb.conf; File &smbmdash; Part A
+		+ B + C</link> execute the following:
+<screen>
+&rootprompt; smbpasswd -w buttercup
+</screen>
+		This will install in the <filename>secrets.tdb</filename> file the password that Samba will need to
+		manage (write to) the LDAP Master server to perform account updates.
+		</para></step>
+
 	</procedure>
 
 <example id="ch7-LDAP-master">
@@ -982,7 +994,7 @@ replica     host=lapdc.abmas.biz:389
             bindmethod=simple credentials=not24get
 
 access to attrs=sambaLMPassword,sambaNTPassword
-           by dn="cn=updateuser,dc=abmas,dc=biz" write
+           by dn="cn=sambaadmin,dc=abmas,dc=biz" write
            by * none
 
 replogfile  /var/lib/ldap/replogfile
@@ -1087,7 +1099,7 @@ index default               sub
 <smbconfoption name="ldap user suffix">ou=People</smbconfoption>
 <smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
 <smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
-<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=sambaadmin,dc=abmas,dc=biz</smbconfoption>
 <smbconfoption name="idmap backend">ldap://massive.abmas.biz</smbconfoption>
 <smbconfoption name="idmap uid">10000-20000</smbconfoption>
 <smbconfoption name="idmap gid">10000-20000</smbconfoption>
@@ -1198,7 +1210,7 @@ index default               sub
 <smbconfoption name="ldap user suffix">ou=People</smbconfoption>
 <smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
 <smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
-<smbconfoption name="ldap admin dn">cn=Manager,dc=abmas,dc=biz</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=sambaadmin,dc=abmas,dc=biz</smbconfoption>
 <smbconfoption name="utmp">Yes</smbconfoption>
 <smbconfoption name="idmap backend">ldap://massive.abmas.biz</smbconfoption>
 <smbconfoption name="idmap uid">10000-20000</smbconfoption>
diff --git a/docs/Samba3-HOWTO/TOSHARG-BDC.xml b/docs/Samba3-HOWTO/TOSHARG-BDC.xml
index ba36d5627f..35fdd9ee57 100644
--- a/docs/Samba3-HOWTO/TOSHARG-BDC.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-BDC.xml
@@ -322,7 +322,7 @@ section</link> for an example of the minimum required settings.
 <smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
 <smbconfoption name="ldap machine suffix">ou=Computers</smbconfoption>
 <smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
-<smbconfoption name="ldap admin dn">cn=Manager,dc=quenya,dc=org</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=sambadmin,dc=quenya,dc=org</smbconfoption>
 </smbconfblock>
 </example>
 
@@ -686,7 +686,7 @@ Setup for Being a BDC</link>.
 <smbconfoption name="ldap group suffix">ou=Groups</smbconfoption>
 <smbconfoption name="ldap machine suffix">ou=Computers</smbconfoption>
 <smbconfoption name="ldap idmap suffix">ou=Idmap</smbconfoption>
-<smbconfoption name="ldap admin dn">cn=Manager,dc=quenya,dc=org</smbconfoption>
+<smbconfoption name="ldap admin dn">cn=sambadmin,dc=quenya,dc=org</smbconfoption>
 <smbconfoption name="idmap backend">ldap:ldap://master-ldap.quenya.org</smbconfoption>
 <smbconfoption name="idmap uid">10000-20000</smbconfoption>
 <smbconfoption name="idmap gid">10000-20000</smbconfoption>
diff --git a/docs/Samba3-HOWTO/index.xml b/docs/Samba3-HOWTO/index.xml
index e49db5d225..609f7b174e 100644
--- a/docs/Samba3-HOWTO/index.xml
+++ b/docs/Samba3-HOWTO/index.xml
@@ -164,7 +164,7 @@ The chapters in this part each cover specific Samba features.
 <!-- Comment out the following line to include the manpages.
 	 *Please* do not commit with the line below enabled! -->
 	<!--	 <xi:include href="manpages.xml"/> -->
-	<!-- <xi:include href="manpages.xml"/> -->
+	<xi:include href="manpages.xml"/>
 	<xi:include href="http://www.gnu.org/licenses/gpl.xml"/>
 
 	<xi:include href="TOSHARG-glossary.xml"/>