Stage 1 of PHPTR Edits.

(This used to be commit 64a9e3e8619bf33dcf6b0ff8171b47a3e2581239)

1 files changed, 49 insertions, 39 deletions

diff --git a/docs/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml b/docs/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
index a8c2811511..3a87fcd64c 100644
--- a/docs/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
@@ -9,11 +9,11 @@
 <title>User Rights and Privileges</title>
 
 <para>
-The administration of Windows user, group and machine accounts in the Samba
-domain controlled network necessitates interfacing between the MS Windows
+The administration of Windows user, group, and machine accounts in the Samba
+domain-controlled network necessitates interfacing between the MS Windows
 networking environment and the UNIX operating system environment. The right
 (permission) to add machines to the Windows security domain can be assigned
-(set) to non-administrative users both in Windows NT4 domains as well as in
+(set) to non-administrative users both in Windows NT4 domains and
 Active Directory domains.
 </para>
 
@@ -25,14 +25,12 @@ user logons.
 </para>
 
 <para>
-Machine accounts are analogous to user accounts, and thus in implementing them
-on a UNIX machine that is hosting Samba (i.e.: On which Samba is running) it is
-necessary to create a special type of user account. Machine accounts differ from
-a normal user account in that the account name (login ID) is terminated with a $
-sign. An additional difference is that this type of account should not ever be able
-to log into the UNIX environment as a system user and therefore is set to have a
-shell of <command>/bin/false</command> and a home directory of 
-<command>/dev/null.</command>
+Machine accounts are analogous to user accounts, and thus in implementing them on a UNIX machine that is
+hosting Samba (i.e., on which Samba is running) it is necessary to create a special type of user account.
+Machine accounts differ from a normal user account in that the account name (login ID) is terminated with a
+<literal>$</literal> sign. An additional difference is that this type of account should not ever be able to
+log into the UNIX environment as a system user and therefore is set to have a shell of
+<command>/bin/false</command> and a home directory of <command>/dev/null.</command>
 </para>
 
 <para>
@@ -45,13 +43,13 @@ same UID. Any UNIX user who has a UID=0 is inherently the same as the
 
 <para>
 All versions of Samba call system interface scripts that permit CIFS function
-calls that are used to manage users, groups and machine accounts to be affected
+calls that are used to manage users, groups, and machine accounts
 in the UNIX environment. All versions of Samba up to and including version 3.0.10
-required the use of a Windows Administrator account that unambiguously maps to
+required the use of a Windows administrator account that unambiguously maps to
 the UNIX <constant>root</constant> account to permit the execution of these
-interface scripts. The reuqirement to do this has understandably met with some
+interface scripts. The requirement to do this has understandably met with some
 disdain and consternation among Samba administrators, particularly where it became
-necessary to permit people who should not posses <constant>root</constant> level
+necessary to permit people who should not possess <constant>root</constant>-level
 access to the UNIX host system.
 </para>
 
@@ -66,7 +64,7 @@ must be defined in the <smbconfsection name="global"/> section of the &smb.conf;
 </para>
 
 <para>
-Currently, the rights supported in Samba 3 are listed in <link linkend="rp-privs"/>.
+Currently, the rights supported in Samba-3 are listed in <link linkend="rp-privs"/>.
 The remainder of this chapter explains how to manage and use these privileges on Samba servers.
 </para>
 
@@ -112,35 +110,35 @@ The remainder of this chapter explains how to manage and use these privileges on
 <para>
 There are two primary means of managing the rights assigned to users and groups
 on a Samba server.  The <command>NT4 User Manager for Domains</command> may be
-used from any Windows NT4, 2000 or XP Professional domain member client to
+used from any Windows NT4, 2000, or XP Professional domain member client to
 connect to a Samba domain controller and view/modify the rights assignments.
 This application, however, appears to have bugs when run on a client running
-Windows 2000 or later, therefore Samba provides a command line utility for
+Windows 2000 or later; therefore, Samba provides a command-line utility for
 performing the necessary administrative actions.
 </para>
 
 <para>
-The <command>net rpc rights</command> utility in Samba 3.0.11 has 3 new subcommands:
+The <command>net rpc rights</command> utility in Samba 3.0.11 has three new subcommands:
 </para>
 
 <variablelist>
 	<varlistentry><term>list [name|accounts]</term>
 		<listitem><para>
 		When called with no arguments, <command>net rpc list</command>
-		will simply list the available rights on the server.  When passed
+		simply lists the available rights on the server.  When passed
 		a specific user or group name, the tool lists the privileges
 		currently assigned to the specified account.  When invoked using
 		the special string <constant>accounts</constant>,
-		<command>net rpc rights list</command> will return a list of all
+		<command>net rpc rights list</command> returns a list of all
 		privileged accounts on the server and the assigned rights.
 		</para></listitem>
 	</varlistentry>
 
 	<varlistentry><term>grant &lt;user&gt; &lt;right [right ...]&gt;</term>
 		<listitem><para>
-		When called with no arguments, This function is used to assign
+		When called with no arguments, this function is used to assign
 		a list of rights to a specified user or group.  For example,
-		to grant the members of the Domain Admins group on a Samba DC
+		to grant the members of the Domain Admins group on a Samba domain controller,
 		the capability to add client machines to the domain, one would run:
 <screen>
 &rootprompt; net -S server -U domadmin rpc rights grant \
@@ -149,13 +147,13 @@ The <command>net rpc rights</command> utility in Samba 3.0.11 has 3 new subcomma
 		More than one privilege can be assigned by specifying a
 		list of rights separated by spaces. The parameter 'Domain\Domain Admins'
 		must be quoted with single ticks or using double-quotes to prevent
-		the back-slash and the space from being interpreted by the system shell.
+		the backslash and the space from being interpreted by the system shell.
 		</para></listitem>
 	</varlistentry>
 
 	<varlistentry><term>revoke &lt;user&gt; &lt;right [right ...]&gt;</term>
 		<listitem><para>
-		This command is similar in format to <command>net rpc rights grant</command>.  It's
+		This command is similar in format to <command>net rpc rights grant</command>.  Its
 		effect is to remove an assigned right (or list of rights) from a user or group.
 		</para></listitem>
 	</varlistentry>
@@ -170,10 +168,10 @@ inherent to the Domain Admins group and is not configurable.
 
 <para>
 By default, no privileges are initially assigned to any
-account.  The reason for this is that certain actions will
+account because certain actions will
 be performed as root once smbd determines that a user has
 the necessary rights.  For example, when joining a client to
-a Windows domain, the 'add machine script' must be executed
+a Windows domain, the `add machine script' must be executed
 with superuser rights in most cases.  For this reason, you
 should be very careful about handing out privileges to
 accounts.
@@ -192,7 +190,7 @@ Access as the root user (UID=0) bypasses all privilege checks.
 The privileges that have been implemented in Samba-3.0.11 are shown below.
 It is possible, and likely, that additional privileges may be implemented in
 later releases of Samba. It is also likely that any privileges currently implemented
-but not used may be removed from future releases, thus it is important that
+but not used may be removed from future releases, so it is important that
 the successful as well as unsuccessful use of these facilities should be reported
 on the Samba mailing lists.
 </para>
@@ -209,7 +207,7 @@ on the Samba mailing lists.
 
 	<varlistentry><term>SeDiskOperatorPrivilege</term>
 		<listitem><para>
-		Accounts which posses this right will be able to execute
+		Accounts that possess this right will be able to execute
 		scripts defined by the <command>add/delete/change</command>
 		share command in &smb.conf; file as root.  Such users will
 		also be able to modify the ACL associated with file shares
@@ -219,8 +217,8 @@ on the Samba mailing lists.
 
 	<varlistentry><term>SeMachineAccountPrivilege</term>
 		<listitem><para>
-		Controls whether or not the user is able join client
-		machines to a Samba controlled domain.
+		Controls whether or not the user can join client
+		machines to a Samba-controlled domain.
 		</para></listitem>
 	</varlistentry>
 
@@ -229,7 +227,7 @@ on the Samba mailing lists.
 		This privilege operates identically to the
 		<smbconfoption name="printer admin"/>
 		option in the &smb.conf; file (see section 5 man page for &smb.conf;)
-		except that it is a global right (not on a per printer basis). 
+		except that it is a global right (not on a per-printer basis). 
 		Eventually the smb.conf option will be deprecated and administrative
 		rights to printers will be controlled exclusively by this right and
 		the security descriptor associated with the printer object in the
@@ -243,7 +241,7 @@ on the Samba mailing lists.
 		the server and for aborting a previously issued shutdown
 		command.  Since this is an operation normally limited by
 		the operating system to the root user, an account must possess this
-		right to be able to execute either of these hooks to have any effect.
+		right to be able to execute either of these hooks.
 		</para></listitem>
 	</varlistentry>
 
@@ -257,22 +255,34 @@ on the Samba mailing lists.
 <title>The Administrator Domain SID</title>
 
 <para>
-Please note that when configured as a DC, it is now required
-that an account in the server's passdb backend be set to the
-domain SID of the default Administrator account.  To obtain the
-domain SID on a Samba DC, run the following command:
-
+Please note that every Windows NT4 and later server requires a domain Adminsitrator account. Samba version
+commencing with 3.0.11 permit the Administrative duties to be performed via assigned rights and privileges
+(see <link linkend="rights">User Rights and Privileges</link>).  An account in the server's passdb backend can
+be set to the domain SID of the default administrator account.  To obtain the domain SID on a Samba domain
+controller, run the following command:
 <screen>
 &rootprompt; net getlocalsid
 SID for domain FOO is: S-1-5-21-4294955119-3368514841-2087710299
 </screen>
-You may assign the Domain Administrator rid to an account using the <command>pdbedit</command>
+You may assign the domain administrator RID to an account using the <command>pdbedit</command>
 command as shown here:
 <screen>
 &rootprompt; pdbedit -U S-1-5-21-4294955119-3368514841-2087710299-500 -u root -r
 </screen>
 </para>
 
+<note><para>
+The RID 500 is the well known standard value of the default Administrator account. It is the RID
+that confers the rights and privileges that the Administrator account has on a Windows machine
+or domain. Under UNIX/Linux the equivalent is UID=0 (the root account).
+</para></note>
+
+<para>
+Commencing with Samba version 3.0.11 it is possible to operate without an Administrator account
+providing equivalent rights and privileges have been established for a Windows user or a Windows
+group account.
+</para>
+
 </sect1>
 
 </chapter>