More fixes.

(This used to be commit d30d69cfdb8c7eca760692e594e69a9fbb508610)

2 files changed, 20 insertions, 15 deletions

diff --git a/docs/Samba-Guide/SBE-MakingHappyUsers.xml b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
index a6da8c25cf..ed67c8b992 100644
--- a/docs/Samba-Guide/SBE-MakingHappyUsers.xml
+++ b/docs/Samba-Guide/SBE-MakingHappyUsers.xml
@@ -1407,6 +1407,8 @@ directory information tree (DIT). In the examples that follow they have been loc
 	      </indexterm>
 		Install the file shown in <link linkend="sbehap-slapdconf"/> in the directory
 		<filename>/etc/openldap</filename>.
+		The <constant>rootpw</constant> value is an enrypted password string that can be
+		generated by executing the <command>slappasswd</command> command.
 		</para></step>
 
 	  <step><para><indexterm>
@@ -2034,7 +2036,6 @@ change the path to them in your &smb.conf; file on the PDC (<constant>MASSIVE</c
 &rootprompt; cd smbldap-tools-0.8.8/
 &rootprompt; cp smbldap-* configure.pl *pm /opt/IDEALX/sbin/
 &rootprompt; cp smbldap*conf /etc/smbldap-tools/
-&rootprompt; chmod 750 /opt/IDEALX/sbin/smbldap-*
 &rootprompt; chmod 750 /opt/IDEALX/sbin/configure.pl
 &rootprompt; chmod 640 /etc/smbldap-tools/smbldap.conf
 &rootprompt; chmod 600 /etc/smbldap-tools/smbldap_bind.conf
@@ -2060,7 +2061,7 @@ my $smbldap_bind_conf="/etc/smbldap-tools/smbldap_bind.conf";
 		To complete the configuration of the smbldap-tools, set the permissions and ownership
 		by executing the following commands:
 <screen>
-&rootprompt; chown root.root /opt/IDEALX/sbin/* 
+&rootprompt; chown -R root:root /opt/IDEALX/sbin/* 
 &rootprompt; chmod 755 /opt/IDEALX/sbin/smbldap-*
 &rootprompt; chmod 640 /opt/IDEALX/sbin/smb*pm 
 </screen>
diff --git a/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml b/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
index 52e807ebc3..05694d0258 100644
--- a/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
+++ b/docs/Samba-Guide/SBE-MigrateNT4Samba3.xml
@@ -307,17 +307,19 @@
 
 	<para>
 	Verify that you have correctly specified in the &smb.conf; file the scripts, and arguments 
-	that should be passed to them, before attempting to perform the account migration.
+	that should be passed to them, before attempting to perform the account migration. Note also
+	that the deletion scripts must be commented out during migration. These should be uncommented
+	following successful migration of the NT4 Domain accounts.
 	</para>
 
 	<warning><para>
-	Under absolutely no situations should be the Samba daemons be started until instructed to do so.
+	Under absolutely no situations should the Samba daemons be started until instructed to do so.
 	Delete the <filename>/etc/samba/secrets.tdb</filename> file and all Samba control tdb files
 	before commencing the following configuration steps.
 	</para></warning>
 
 	<table id="ch8-vampire">
-		<title>Samba &smb.conf; Scripts Essential to Migration</title>
+		<title>Samba &smb.conf; Scripts Essential to Samba Operation</title>
 		<tgroup cols="3">
 			<colspec align="left"/>
 			<colspec align="center"/>
@@ -394,7 +396,7 @@
 		<step><para>
 		Configure the Samba &smb.conf; file to create a BDC. An example configuration is
 		given in <link linkend="sbent4smb"/>.
-		The delete scripts are correctly commented out so that during the process of migration
+		The delete scripts are commented out so that during the process of migration
 		no account information can be deleted.
 		</para></step>
 
@@ -416,10 +418,10 @@
         show add printer wizard = Yes
         add user script = /opt/IDEALX/sbin/smbldap-useradd -m '%u'
 #       delete user script = /opt/IDEALX/sbin/smbldap-userdel '%u'
-        add group script = /opt/IDEALX/sbin/smbldap-groupadd -p '%g'
+        add group script = /opt/IDEALX/sbin/smbldap-groupadd -p '%g' -t domain
 #       delete group script = /opt/IDEALX/sbin/smbldap-groupdel '%g'
-        add user to group script = /opt/IDEALX/sbin/smbldap-groupmod -m '%u' '%g'
-#       delete user from group script = /opt/IDEALX/sbin/smbldap-groupmod -x '%u' '%g'
+        add user to group script = /opt/IDEALX/sbin/smbldap-groupmod -m '%u' '%g' -t domain
+#       delete user from group script = /opt/IDEALX/sbin/smbldap-groupmod -x '%u' '%g' -t domain
         set primary group script = /opt/IDEALX/sbin/smbldap-usermod -g '%g' '%u'
         add machine script = /opt/IDEALX/sbin/smbldap-useradd -w '%u'
         logon script = scripts\logon.cmd
@@ -429,7 +431,7 @@
         domain logons = Yes
         domain master = No
 #       wins support = Yes
-	wins server = 192.168.123.124
+        wins server = 192.168.123.124
         ldap admin dn = cn=Manager,dc=terpstra-world,dc=org
         ldap group suffix = ou=Groups
         ldap idmap suffix = ou=Idmap
@@ -504,7 +506,9 @@
 		<indexterm><primary>slapd.conf</primary></indexterm>
 		Configure OpenLDAP in preparation for the migration. An example
 		<filename>sladp.conf</filename> file is shown in <link linkend="sbentslapd"/>.
-                </para></step>
+		The <constant>rootpw</constant> value is an encrypted password string that can
+		be obtained by executing the <command>slappasswd</command> command.
+		</para></step>
 
 <example id="sbentslapd">
 <title>NT4 Migration LDAP Server Configuration File: <filename>/etc/openldap/slapd.conf</filename> &smbmdash; Part A</title>
@@ -606,7 +610,7 @@ ssl off
 		Edit the <filename>/etc/nsswitch.conf</filename> file so it has the entries shown
 		in <link linkend="sbentnss"/>. Note that the LDAP entries have been commented out.
 		This is deliberate. If these entries are active (not commented out), and the
-		<filename>/ec/ldap.conf</filename> file has been configured, when the LDAP server
+		<filename>/etc/ldap.conf</filename> file has been configured, when the LDAP server
 		is started, the process of starting the LDAP server will cause LDAP lookups. This
 		causes the LDAP server <command>slapd</command> to hang because it finds port 389
 		open and therefore can not gain exclusive control of it. By commenting these entries
@@ -792,8 +796,8 @@ writing new configuration file:
 		</para></step>
 
 		<step><para>
-		Edit the <filename>/etc/nsswitch.conf</filename> file so it has the following entries:
-		Note that the LDAP entries above have now been uncommented.
+		Edit the <filename>/etc/nsswitch.conf</filename> file so it has the entries shown in
+		<link linkend="sbentnss2"/>. Note that the LDAP entries have now been uncommented.
 		</para></step>
 
 <example id="sbentnss2">
@@ -925,7 +929,7 @@ New password : ********
 Retype new password : ********
 </screen>
 		Note: During account migration the Windows Administrator account will not be migrated
-		the the Samba server.
+		to the Samba server.
 		</para></step>
 
 		<step><para>