2.2.3 now in sync.

Jeremy.

5 files changed, 829 insertions, 243 deletions

diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 870b0ec6e82..8009bb8b86f 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -668,155 +668,231 @@ HREF="#AEN1602"
 ></DD
 ><DT
 >9. <A
-HREF="#SAMBA-LDAP-HOWTO"
->Storing Samba's User/Machine Account information in an LDAP Directory</A
+HREF="#SAMBA-BDC"
+>How to a Purely Samba Controlled Domain</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.1. <A
 HREF="#AEN1638"
->Purpose</A
+>Prerequisite Reading</A
 ></DT
 ><DT
 >9.2. <A
-HREF="#AEN1652"
->Introduction</A
+HREF="#AEN1642"
+>Background</A
 ></DT
 ><DT
 >9.3. <A
-HREF="#AEN1677"
->Supported LDAP Servers</A
+HREF="#AEN1650"
+>What qualifies a Domain Controller on the network?</A
+></DT
+><DD
+><DL
+><DT
+>9.3.1. <A
+HREF="#AEN1653"
+>How does a Workstation find its domain controller?</A
 ></DT
 ><DT
+>9.3.2. <A
+HREF="#AEN1656"
+>When is the PDC needed?</A
+></DT
+></DL
+></DD
+><DT
 >9.4. <A
-HREF="#AEN1682"
->Schema and Relationship to the RFC 2307 posixAccount</A
+HREF="#AEN1659"
+>Can Samba be a Backup Domain Controller?</A
 ></DT
 ><DT
 >9.5. <A
-HREF="#AEN1706"
->smb.conf LDAP parameters</A
+HREF="#AEN1663"
+>How do I set up a Samba BDC?</A
+></DT
+><DD
+><DL
+><DT
+>9.5.1. <A
+HREF="#AEN1679"
+>How do I replicate the smbpasswd file?</A
 ></DT
+></DL
+></DD
+></DL
+></DD
 ><DT
->9.6. <A
-HREF="#AEN1734"
+>10. <A
+HREF="#SAMBA-LDAP-HOWTO"
+>Storing Samba's User/Machine Account information in an LDAP Directory</A
+></DT
+><DD
+><DL
+><DT
+>10.1. <A
+HREF="#AEN1700"
+>Purpose</A
+></DT
+><DT
+>10.2. <A
+HREF="#AEN1720"
+>Introduction</A
+></DT
+><DT
+>10.3. <A
+HREF="#AEN1749"
+>Supported LDAP Servers</A
+></DT
+><DT
+>10.4. <A
+HREF="#AEN1754"
+>Schema and Relationship to the RFC 2307 posixAccount</A
+></DT
+><DT
+>10.5. <A
+HREF="#AEN1766"
+>Configuring Samba with LDAP</A
+></DT
+><DD
+><DL
+><DT
+>10.5.1. <A
+HREF="#AEN1768"
+>OpenLDAP configuration</A
+></DT
+><DT
+>10.5.2. <A
+HREF="#AEN1785"
+>Configuring Samba</A
+></DT
+></DL
+></DD
+><DT
+>10.6. <A
+HREF="#AEN1813"
+>Accounts and Groups management</A
+></DT
+><DT
+>10.7. <A
+HREF="#AEN1818"
 >Security and sambaAccount</A
 ></DT
 ><DT
->9.7. <A
-HREF="#AEN1753"
-></A
+>10.8. <A
+HREF="#AEN1838"
+>LDAP specials attributes for sambaAccounts</A
 ></DT
 ><DT
->9.8. <A
-HREF="#AEN1773"
+>10.9. <A
+HREF="#AEN1908"
 >Example LDIF Entries for a sambaAccount</A
 ></DT
 ><DT
->9.9. <A
-HREF="#AEN1781"
+>10.10. <A
+HREF="#AEN1916"
 >Comments</A
 ></DT
 ></DL
 ></DD
 ><DT
->10. <A
+>11. <A
 HREF="#WINBIND"
 >Unified Logons between Windows NT and UNIX using Winbind</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.1. <A
-HREF="#AEN1810"
+>11.1. <A
+HREF="#AEN1945"
 >Abstract</A
 ></DT
 ><DT
->10.2. <A
-HREF="#AEN1814"
+>11.2. <A
+HREF="#AEN1949"
 >Introduction</A
 ></DT
 ><DT
->10.3. <A
-HREF="#AEN1827"
+>11.3. <A
+HREF="#AEN1962"
 >What Winbind Provides</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.3.1. <A
-HREF="#AEN1834"
+>11.3.1. <A
+HREF="#AEN1969"
 >Target Uses</A
 ></DT
 ></DL
 ></DD
 ><DT
->10.4. <A
-HREF="#AEN1838"
+>11.4. <A
+HREF="#AEN1973"
 >How Winbind Works</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.4.1. <A
-HREF="#AEN1843"
+>11.4.1. <A
+HREF="#AEN1978"
 >Microsoft Remote Procedure Calls</A
 ></DT
 ><DT
->10.4.2. <A
-HREF="#AEN1847"
+>11.4.2. <A
+HREF="#AEN1982"
 >Name Service Switch</A
 ></DT
 ><DT
->10.4.3. <A
-HREF="#AEN1863"
+>11.4.3. <A
+HREF="#AEN1998"
 >Pluggable Authentication Modules</A
 ></DT
 ><DT
->10.4.4. <A
-HREF="#AEN1871"
+>11.4.4. <A
+HREF="#AEN2006"
 >User and Group ID Allocation</A
 ></DT
 ><DT
->10.4.5. <A
-HREF="#AEN1875"
+>11.4.5. <A
+HREF="#AEN2010"
 >Result Caching</A
 ></DT
 ></DL
 ></DD
 ><DT
->10.5. <A
-HREF="#AEN1878"
+>11.5. <A
+HREF="#AEN2013"
 >Installation and Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.5.1. <A
-HREF="#AEN1883"
+>11.5.1. <A
+HREF="#AEN2018"
 >Introduction</A
 ></DT
 ><DT
->10.5.2. <A
-HREF="#AEN1896"
+>11.5.2. <A
+HREF="#AEN2031"
 >Requirements</A
 ></DT
 ><DT
->10.5.3. <A
-HREF="#AEN1910"
+>11.5.3. <A
+HREF="#AEN2045"
 >Testing Things Out</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.5.3.1. <A
-HREF="#AEN1921"
+>11.5.3.1. <A
+HREF="#AEN2056"
 >Configure and compile SAMBA</A
 ></DT
 ><DT
->10.5.3.2. <A
-HREF="#AEN1940"
+>11.5.3.2. <A
+HREF="#AEN2075"
 >Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -824,31 +900,31 @@ CLASS="FILENAME"
 winbind libraries</A
 ></DT
 ><DT
->10.5.3.3. <A
-HREF="#AEN1965"
+>11.5.3.3. <A
+HREF="#AEN2100"
 >Configure smb.conf</A
 ></DT
 ><DT
->10.5.3.4. <A
-HREF="#AEN1981"
+>11.5.3.4. <A
+HREF="#AEN2116"
 >Join the SAMBA server to the PDC domain</A
 ></DT
 ><DT
->10.5.3.5. <A
-HREF="#AEN1992"
+>11.5.3.5. <A
+HREF="#AEN2127"
 >Start up the winbindd daemon and test it!</A
 ></DT
 ><DT
->10.5.3.6. <A
-HREF="#AEN2028"
+>11.5.3.6. <A
+HREF="#AEN2163"
 >Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
 > startup files</A
 ></DT
 ><DT
->10.5.3.7. <A
-HREF="#AEN2050"
+>11.5.3.7. <A
+HREF="#AEN2185"
 >Configure Winbind and PAM</A
 ></DT
 ></DL
@@ -856,52 +932,52 @@ HREF="#AEN2050"
 ></DL
 ></DD
 ><DT
->10.6. <A
-HREF="#AEN2097"
+>11.6. <A
+HREF="#AEN2232"
 >Limitations</A
 ></DT
 ><DT
->10.7. <A
-HREF="#AEN2107"
+>11.7. <A
+HREF="#AEN2242"
 >Conclusion</A
 ></DT
 ></DL
 ></DD
 ><DT
->11. <A
+>12. <A
 HREF="#OS2"
 >OS2 Client HOWTO</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.1. <A
-HREF="#AEN2121"
+>12.1. <A
+HREF="#AEN2256"
 >FAQs</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.1.1. <A
-HREF="#AEN2123"
+>12.1.1. <A
+HREF="#AEN2258"
 >How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></DT
 ><DT
->11.1.2. <A
-HREF="#AEN2138"
+>12.1.2. <A
+HREF="#AEN2273"
 >How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></DT
 ><DT
->11.1.3. <A
-HREF="#AEN2147"
+>12.1.3. <A
+HREF="#AEN2282"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
->11.1.4. <A
-HREF="#AEN2151"
+>12.1.4. <A
+HREF="#AEN2286"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
@@ -910,32 +986,32 @@ HREF="#AEN2151"
 ></DL
 ></DD
 ><DT
->12. <A
+>13. <A
 HREF="#CVS-ACCESS"
 >HOWTO Access Samba source code via CVS</A
 ></DT
 ><DD
 ><DL
 ><DT
->12.1. <A
-HREF="#AEN2167"
+>13.1. <A
+HREF="#AEN2302"
 >Introduction</A
 ></DT
 ><DT
->12.2. <A
-HREF="#AEN2172"
+>13.2. <A
+HREF="#AEN2307"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
->12.2.1. <A
-HREF="#AEN2175"
+>13.2.1. <A
+HREF="#AEN2310"
 >Access via CVSweb</A
 ></DT
 ><DT
->12.2.2. <A
-HREF="#AEN2180"
+>13.2.2. <A
+HREF="#AEN2315"
 >Access via cvs</A
 ></DT
 ></DL
@@ -944,7 +1020,7 @@ HREF="#AEN2180"
 ></DD
 ><DT
 ><A
-HREF="#AEN2208"
+HREF="#AEN2343"
 >Index</A
 ></DT
 ></DL
@@ -1202,15 +1278,15 @@ NAME="AEN78"
 >1.6. Step 5: Starting the smbd and nmbd</A
 ></H1
 ><P
->You must choose to start smbd and nmbd either 
+>You must choose to start smbd and nmbd either
 	as daemons or from <B
 CLASS="COMMAND"
 >inetd</B
->. Don't try 
+>. Don't try
 	to do both!  Either you can put them in <TT
 CLASS="FILENAME"
 >	inetd.conf</TT
-> and have them started on demand 
+> and have them started on demand
 	by <B
 CLASS="COMMAND"
 >inetd</B
@@ -1218,9 +1294,9 @@ CLASS="COMMAND"
 	daemons either from the command line or in <TT
 CLASS="FILENAME"
 >	/etc/rc.local</TT
->. See the man pages for details 
-	on the command line options. Take particular care to read 
-	the bit about what user you need to be in order to start 
+>. See the man pages for details
+	on the command line options. Take particular care to read
+	the bit about what user you need to be in order to start
 	Samba.  In many cases you must be root.</P
 ><P
 >The main advantage of starting <B
@@ -1230,9 +1306,9 @@ CLASS="COMMAND"
 	and <B
 CLASS="COMMAND"
 >nmbd</B
-> as a daemon is that they will 
-	respond slightly more quickly to an initial connection
-	request. This is, however, unlikely to be a problem.</P
+> using the recommended daemon method
+	is that they will respond slightly more quickly to an initial connection
+	request.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2
@@ -7887,8 +7963,8 @@ within its registry.</P
 CLASS="CHAPTER"
 ><HR><H1
 ><A
-NAME="SAMBA-LDAP-HOWTO"
->Chapter 9. Storing Samba's User/Machine Account information in an LDAP Directory</A
+NAME="SAMBA-BDC"
+>Chapter 9. How to a Purely Samba Controlled Domain</A
 ></H1
 ><DIV
 CLASS="SECT1"
@@ -7896,11 +7972,253 @@ CLASS="SECT1"
 CLASS="SECT1"
 ><A
 NAME="AEN1638"
->9.1. Purpose</A
+>9.1. Prerequisite Reading</A
+></H1
+><P
+>Before you continue reading in this chapter, please make sure
+that you are comfortable with configuring a Samba PDC
+as described in the <A
+HREF="Samba-PDC-HOWTO.html"
+TARGET="_top"
+>Samba-PDC-HOWTO</A
+>.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1642"
+>9.2. Background</A
+></H1
+><P
+>What is a Domain Controller? It is a machine that is able to answer
+logon requests from workstations in a Windows NT Domain. Whenever a
+user logs into a Windows NT Workstation, the workstation connects to a
+Domain Controller and asks him whether the username and password the
+user typed in is correct.  The Domain Controller replies with a lot of
+information about the user, for example the place where the users
+profile is stored, the users full name of the user. All this
+information is stored in the NT user database, the so-called SAM.</P
+><P
+>There are two kinds of Domain Controller in a NT 4 compatible Domain:
+A Primary Domain Controller (PDC) and one or more Backup Domain
+Controllers (BDC). The PDC contains the master copy of the
+SAM. Whenever the SAM has to change, for example when a user changes
+his password, this change has to be done on the PDC. A Backup Domain
+Controller is a machine that maintains a read-only copy of the
+SAM. This way it is able to reply to logon requests and authenticate
+users in case the PDC is not available. During this time no changes to
+the SAM are possible. Whenever changes to the SAM are done on the PDC,
+all BDC receive the changes from the PDC.</P
+><P
+>Since version 2.2 Samba officially supports domain logons for all
+current Windows Clients, including Windows 2000 and XP. This text
+assumes the domain to be named SAMBA. To be able to act as a PDC, some
+parameters in the [global]-section of the smb.conf have to be set:</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>workgroup = SAMBA
+domain master = yes
+domain logons = yes</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>Several other things like a [homes] and a [netlogon] share also may be
+set along with settings for the profile path, the users home drive and
+others. This will not be covered in this document.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1650"
+>9.3. What qualifies a Domain Controller on the network?</A
+></H1
+><P
+>Every machine that is a Domain Controller for the domain SAMBA has to
+register the NetBIOS group name SAMBA#1c with the WINS server and/or
+by broadcast on the local network. The PDC also registers the unique
+NetBIOS name SAMBA#1b with the WINS server. The name type #1b is
+normally reserved for the domain master browser, a role that has
+nothing to do with anything related to authentication, but the
+Microsoft Domain implementation requires the domain master browser to
+be on the same machine as the PDC.</P
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN1653"
+>9.3.1. How does a Workstation find its domain controller?</A
+></H2
+><P
+>A NT workstation in the domain SAMBA that wants a local user to be
+authenticated has to find the domain controller for SAMBA. It does
+this by doing a NetBIOS name query for the group name SAMBA#1c. It
+assumes that each of the machines it gets back from the queries is a
+domain controller and can answer logon requests. To not open security
+holes both the workstation and the selected (TODO: How is the DC
+chosen) domain controller authenticate each other. After that the
+workstation sends the user's credentials (his name and password) to
+the domain controller, asking for approval.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN1656"
+>9.3.2. When is the PDC needed?</A
+></H2
+><P
+>Whenever a user wants to change his password, this has to be done on
+the PDC. To find the PDC, the workstation does a NetBIOS name query
+for SAMBA#1b, assuming this machine maintains the master copy of the
+SAM. The workstation contacts the PDC, both mutually authenticate and
+the password change is done.</P
+></DIV
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1659"
+>9.4. Can Samba be a Backup Domain Controller?</A
+></H1
+><P
+>With version 2.2, no. The native NT SAM replication protocols have
+not yet been fully implemented. The Samba Team is working on
+understanding and implementing the protocols, but this work has not
+been finished for version 2.2.</P
+><P
+>Can I get the benefits of a BDC with Samba?  Yes. The main reason for
+implementing a BDC is availability. If the PDC is a Samba machine,
+a second Samba machine can be set up to
+service logon requests whenever the PDC is down.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1663"
+>9.5. How do I set up a Samba BDC?</A
+></H1
+><P
+>Several things have to be done:</P
+><P
+></P
+><UL
+><LI
+><P
+>The file private/MACHINE.SID identifies the domain. When a samba
+server is first started, it is created on the fly and must never be
+changed again. This file has to be the same on the PDC and the BDC,
+so the MACHINE.SID has to be copied from the PDC to the BDC.</P
+></LI
+><LI
+><P
+>The Unix user database has to be synchronized from the PDC to the
+BDC. This means that both the /etc/passwd and /etc/group have to be
+replicated from the PDC to the BDC. This can be done manually
+whenever changes are made, or the PDC is set up as a NIS master
+server and the BDC as a NIS slave server. To set up the BDC as a
+mere NIS client would not be enough, as the BDC would not be able to
+access its user database in case of a PDC failure.</P
+></LI
+><LI
+><P
+>The Samba password database in the file private/smbpasswd has to be
+replicated from the PDC to the BDC. This is a bit tricky, see the
+next section.</P
+></LI
+><LI
+><P
+>Any netlogon share has to be replicated from the PDC to the
+BDC. This can be done manually whenever login scripts are changed,
+or it can be done automatically together with the smbpasswd
+synchronization.</P
+></LI
+></UL
+><P
+>Finally, the BDC has to be found by the workstations. This can be done
+by setting</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>workgroup = samba
+domain master = no
+domain logons = yes</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>in the [global]-section of the smb.conf of the BDC. This makes the BDC
+only register the name SAMBA#1c with the WINS server. This is no
+problem as the name SAMBA#1c is a NetBIOS group name that is meant to
+be registered by more than one machine. The parameter 'domain master =
+no' forces the BDC not to register SAMBA#1b which as a unique NetBIOS
+name is reserved for the Primary Domain Controller.</P
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN1679"
+>9.5.1. How do I replicate the smbpasswd file?</A
+></H2
+><P
+>Replication of the smbpasswd file is sensitive. It has to be done
+whenever changes to the SAM are made. Every user's password change is
+done in the smbpasswd file and has to be replicated to the BDC. So
+replicating the smbpasswd file very often is necessary.</P
+><P
+>As the smbpasswd file contains plain text password equivalents, it
+must not be sent unencrypted over the wire. The best way to set up
+smbpasswd replication from the PDC to the BDC is to use the utility
+rsync. rsync can use ssh as a transport. ssh itself can be set up to
+accept *only* rsync transfer without requiring the user to type a
+password.</P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="CHAPTER"
+><HR><H1
+><A
+NAME="SAMBA-LDAP-HOWTO"
+>Chapter 10. Storing Samba's User/Machine Account information in an LDAP Directory</A
+></H1
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN1700"
+>10.1. Purpose</A
 ></H1
 ><P
 >This document describes how to use an LDAP directory for storing Samba user
-account information normally stored in the smbpasswd(5) file.  It is
+account information traditionally stored in the smbpasswd(5) file.  It is
 assumed that the reader already has a basic understanding of LDAP concepts
 and has a working directory server already installed.  For more information
 on LDAP architectures and Directories, please refer to the following sites.</P
@@ -7933,21 +8251,38 @@ TARGET="_top"
 a guide to LDAP for System Administrators which has a planned release date of
 early summer, 2002.</P
 ><P
->It may also be helpful to supplement the reading of the HOWTO with 
-the <A
+>Two additional Samba resources which may prove to be helpful are</P
+><P
+></P
+><UL
+><LI
+><P
+>The <A
 HREF="http://www.unav.es/cti/ldap-smb/ldap-smb-2_2-howto.html"
 TARGET="_top"
 >Samba-PDC-LDAP-HOWTO</A
 >
-maintained by Ignacio Coupeau.</P
+	maintained by Ignacio Coupeau.</P
+></LI
+><LI
+><P
+>The NT migration scripts from <A
+HREF="http://samba.idealx.org/"
+TARGET="_top"
+>IDEALX</A
+> that are
+	geared to manage users and group in such a Samba-LDAP Domain Controller configuration.
+	</P
+></LI
+></UL
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1652"
->9.2. Introduction</A
+NAME="AEN1720"
+>10.2. Introduction</A
 ></H1
 ><P
 >Traditionally, when configuring <A
@@ -7967,11 +8302,17 @@ CLASS="FILENAME"
 disadvantages to this approach for sites with very large numbers of users (counted
 in the thousands).</P
 ><P
+></P
+><UL
+><LI
+><P
 >The first is that all lookups must be performed sequentially.  Given that
 there are approximately two lookups per domain logon (one for a normal
 session connection such as when mapping a network drive or printer), this
-is non-optimal.  What is needed is an indexed approach such as is used in
-databases.</P
+is a performance bottleneck for lareg sites.  What is needed is an indexed approach
+such as is used in databases.</P
+></LI
+><LI
 ><P
 >The second problem is that administrators who desired to replicate a
 smbpasswd file to more than one Samba server were left to use external
@@ -7983,16 +8324,20 @@ CLASS="COMMAND"
 >ssh(1)</B
 >
 and wrote custom, in-house scripts.</P
+></LI
+><LI
 ><P
 >And finally, the amount of information which is stored in an
 smbpasswd entry leaves no room for additional attributes such as
 a home directory, password expiration time, or even a Relative
 Identified (RID).</P
+></LI
+></UL
 ><P
 >As a result of these defeciencies, a more robust means of storing user attributes
 used by smbd was developed.  The API which defines access to user accounts
-is referred to as the samdb interface (previously this was called the passdb
-API, and is still so named in the CVS trees).  In Samba 2.2.3, enabling support
+is commonly referred to as the samdb interface (previously this was called the passdb
+API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support
 for a samdb backend (e.g. <TT
 CLASS="PARAMETER"
 ><I
@@ -8053,8 +8398,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1677"
->9.3. Supported LDAP Servers</A
+NAME="AEN1749"
+>10.3. Supported LDAP Servers</A
 ></H1
 ><P
 >The LDAP samdb code in 2.2.3 has been developed and tested using the OpenLDAP
@@ -8078,8 +8423,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1682"
->9.4. Schema and Relationship to the RFC 2307 posixAccount</A
+NAME="AEN1754"
+>10.4. Schema and Relationship to the RFC 2307 posixAccount</A
 ></H1
 ><P
 >Samba 2.2.3 includes the necessary schema file for OpenLDAP 2.0 in
@@ -8104,7 +8449,7 @@ CLASS="PROGRAMLISTING"
      MAY  ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
             logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $
             displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $
-            description $ userWorkstations $ primaryGroupID ))</PRE
+            description $ userWorkstations $ primaryGroupID $ domain ))</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8140,6 +8485,23 @@ This means that the Samba server must also have the LDAP NSS library installed
 and functioning correctly.  This division of information makes it possible to
 store all Samba account information in LDAP, but still maintain UNIX account
 information in NIS while the network is transitioning to a full LDAP infrastructure.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1766"
+>10.5. Configuring Samba with LDAP</A
+></H1
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="AEN1768"
+>10.5.1. OpenLDAP configuration</A
+></H2
 ><P
 >To include support for the sambaAccount object in an OpenLDAP directory
 server, first copy the samba.schema file to slapd's configuration directory.</P
@@ -8199,15 +8561,47 @@ include            /etc/openldap/schema/samba.schema
 ></TR
 ></TABLE
 ></P
+><P
+>It is recommended that you maintain some indices on some of the most usefull attributes,
+like in the following example, to speed up searches made on sambaAccount objectclasses
+(and possibly posixAccount and posixGroup as well).</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+># Indices to maintain
+## required by OpenLDAP 2.0
+index objectclass   eq
+
+## support pb_getsampwnam()
+index uid           pres,eq
+## support pdb_getsambapwrid()
+index rid           eq
+
+## uncomment these if you are storing posixAccount and
+## posixGroup entries in the directory as well
+##index uidNumber     eq
+##index gidNumber     eq
+##index cn            eq
+##index memberUid     eq</PRE
+></TD
+></TR
+></TABLE
+></P
 ></DIV
 ><DIV
-CLASS="SECT1"
-><HR><H1
-CLASS="SECT1"
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
 ><A
-NAME="AEN1706"
->9.5. smb.conf LDAP parameters</A
-></H1
+NAME="AEN1785"
+>10.5.2. Configuring Samba</A
+></H2
 ><P
 >The following parameters are available in smb.conf only with <TT
 CLASS="PARAMETER"
@@ -8305,7 +8699,7 @@ CLASS="REPLACEABLE"
 >' to store the
      # passphrase in the secrets.tdb file.  If the "ldap admin dn" values
      # changes, this password will need to be reset.
-     ldap admin dn = "cn=Manager,dc=samba,dc=org"
+     ldap admin dn = "cn=Samba Manager,ou=people,dc=samba,dc=org"
 
      #  specify the LDAP server's hostname (defaults to locahost)
      ldap server = ahab.samba.org
@@ -8328,13 +8722,39 @@ CLASS="REPLACEABLE"
 ></TABLE
 ></P
 ></DIV
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1813"
+>10.6. Accounts and Groups management</A
+></H1
+><P
+>As users accounts are managed thru the sambaAccount objectclass, you should
+modify you existing administration tools to deal with sambaAccount attributes.</P
+><P
+>Machines accounts are managed with the sambaAccount objectclass, just
+like users accounts. However, it's up to you to stored thoses accounts
+in a different tree of you LDAP namespace: you should use
+"ou=Groups,dc=plainjoe,dc=org" to store groups and
+"ou=People,dc=plainjoe,dc=org" to store users. Just configure your
+NSS and PAM accordingly (usually, in the /etc/ldap.conf configuration
+file).</P
+><P
+>In Samba release 2.2.3, the group management system is based on posix
+groups. This meand that Samba make usage of the posixGroup objectclass.
+For now, there is no NT-like group system management (global and local
+groups).</P
+></DIV
 ><DIV
 CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1734"
->9.6. Security and sambaAccount</A
+NAME="AEN1818"
+>10.7. Security and sambaAccount</A
 ></H1
 ><P
 >There are two important points to remember when discussing the security
@@ -8359,7 +8779,12 @@ of sambaAccount entries in the directory.</P
 ></UL
 ><P
 >These password hashes are clear text equivalents and can be used to impersonate
-the user without deriving the original clear text strings.</P
+the user without deriving the original clear text strings.  For more information
+on the details of LM/NT password hashes, refer to the <A
+HREF="ENCRYPTION.html"
+TARGET="_top"
+>ENCRYPTION chapter</A
+> of the Samba-HOWTO-Collection.</P
 ><P
 >To remedy the first security issue, the "ldap ssl" smb.conf parameter defaults
 to require an encrypted session (<B
@@ -8375,6 +8800,10 @@ CLASS="COMMAND"
 >ldap ssl = off</B
 >).</P
 ><P
+>Note that the LDAPS protocol is deprecated in favor of the LDAPv3 StartTLS
+extended operation.  However, the OpenLDAP library still provides support for
+the older method of securing communication between clients and servers.</P
+><P
 >The second security precaution is to prevent non-administrative users from
 harvesting password hashes from the directory.  This can be done using the
 following ACL in <TT
@@ -8390,60 +8819,200 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->## allow users to update their own password, but not to browse others
-access to attrs=userPassword,lmPassword,ntPassword
-     by self write
-     by * auth</PRE
+>## allow the "ldap admin dn" access, but deny everyone else
+access to attrs=lmPassword,ntPassword
+     by dn="cn=Samba Admin,ou=people,dc=plainjoe,dc=org" write
+     by * none</PRE
 ></TD
 ></TR
 ></TABLE
 ></P
-><P
->You may of course, add in write access to administrative DN's as necessary.</P
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1753"
->9.7. </A
+NAME="AEN1838"
+>10.8. LDAP specials attributes for sambaAccounts</A
 ></H1
 ><P
->There are currently four sambaAccount attributes which map directly onto
-<TT
-CLASS="FILENAME"
->smb.conf</TT
-> parameters.</P
+>The sambaAccount objectclass is composed of the following attributes:</P
 ><P
 ></P
 ><UL
 ><LI
 ><P
->smbHome -&#62; "logon home"</P
+><TT
+CLASS="CONSTANT"
+>lmPassword</TT
+>: the LANMAN password 16-byte hash stored as a character
+	representation of a hexidecimal string.</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>ntPassword</TT
+>: the NT password hash 16-byte stored as a character
+	representation of a hexidecimal string.</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>pwdLastSet</TT
+>: The integer time in seconds since 1970 when the
+	<TT
+CLASS="CONSTANT"
+>lmPassword</TT
+> and <TT
+CLASS="CONSTANT"
+>ntPassword</TT
+> attributes were last set.
+	</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>acctFlags</TT
+>: string of 11 characters surrounded by square brackets []
+	representing account flags such as U (user), W(workstation), X(no password expiration), and
+	D(disabled).</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>logonTime</TT
+>: Integer value currently unused</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>logoffTime</TT
+>: Integer value currently unused</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>kickoffTime</TT
+>: Integer value currently unused</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>pwdCanChange</TT
+>: Integer value currently unused</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>pwdMustChange</TT
+>: Integer value currently unused</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>homeDrive</TT
+>: specifies the drive letter to which to map the
+	UNC path specified by homeDirectory. The drive letter must be specified in the form "X:"
+	where X is the letter of the drive to map. Refer to the "logon drive" parameter in the
+	smb.conf(5) man page for more information.</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>scriptPath</TT
+>: The scriptPath property specifies the path of
+	the user's logon script, .CMD, .EXE, or .BAT file. The string can be null. The path
+	is relative to the netlogon share.  Refer to the "logon script" parameter in the
+	smb.conf(5) man page for more information.</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>profilePath</TT
+>: specifies a path to the user's profile.
+	This value can be a null string, a local absolute path, or a UNC path.  Refer to the
+	"logon path" parameter in the smb.conf(5) man page for more information.</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>smbHome</TT
+>: The homeDirectory property specifies the path of
+	the home directory for the user. The string can be null. If homeDrive is set and specifies
+	a drive letter, homeDirectory should be a UNC path. The path must be a network
+	UNC path of the form \\server\share\directory. This value can be a null string.
+	Refer to the "logon home" parameter in the smb.conf(5) man page for more information.
+	</P
 ></LI
 ><LI
 ><P
->profilePath -&#62; "logon path"</P
+><TT
+CLASS="CONSTANT"
+>userWorkstation</TT
+>: character string value currently unused.
+	</P
 ></LI
 ><LI
 ><P
->homeDrive -&#62; "logon drive"</P
+><TT
+CLASS="CONSTANT"
+>rid</TT
+>: the integer representation of the user's relative identifier
+	(RID).</P
 ></LI
 ><LI
 ><P
->scriptPath -&#62; "logon script"</P
+><TT
+CLASS="CONSTANT"
+>primaryGroupID</TT
+>: the relative identifier (RID) of the primary group
+	of the user.</P
 ></LI
 ></UL
 ><P
->First of all, these parameters are only used when Samba is acting as a
-PDC or a domain (refer to the <A
+>The majority of these parameters are only used when Samba is acting as a PDC of
+a domain (refer to the <A
 HREF="Samba-PDC-HOWTO.html"
 TARGET="_top"
 >Samba-PDC-HOWTO</A
->
-for details on how to configure Samba as a Primary Domain Controller).
-Furthermore, these attributes are only stored with the sambaAccount entry if
+> for details on
+how to configure Samba as a Primary Domain Controller). The following four attributes
+are only stored with the sambaAccount entry if the values are non-default values:</P
+><P
+></P
+><UL
+><LI
+><P
+>smbHome</P
+></LI
+><LI
+><P
+>scriptPath</P
+></LI
+><LI
+><P
+>logonPath</P
+></LI
+><LI
+><P
+>homeDrive</P
+></LI
+></UL
+><P
+>These attributes are only stored with the sambaAccount entry if
 the values are non-default values.  For example, assume TASHTEGO has now been
 configured as a PDC and that <B
 CLASS="COMMAND"
@@ -8458,9 +9027,8 @@ CLASS="PARAMETER"
 ><I
 >logon home</I
 ></TT
-> string is expanded to \\TASHTEGO\becky.</P
-><P
->If the smbHome attribute exists in the entry "uid=becky,ou=people,dc=samba,dc=org",
+> string is expanded to \\TASHTEGO\becky.
+If the smbHome attribute exists in the entry "uid=becky,ou=people,dc=samba,dc=org",
 this value is used.  However, if this attribute does not exist, then the value
 of the <TT
 CLASS="PARAMETER"
@@ -8476,8 +9044,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1773"
->9.8. Example LDIF Entries for a sambaAccount</A
+NAME="AEN1908"
+>10.9. Example LDIF Entries for a sambaAccount</A
 ></H1
 ><P
 >The following is a working LDIF with the inclusion of the posixAccount objectclass:</P
@@ -8552,8 +9120,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1781"
->9.9. Comments</A
+NAME="AEN1916"
+>10.10. Comments</A
 ></H1
 ><P
 >Please mail all comments regarding this HOWTO to <A
@@ -8569,15 +9137,15 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="WINBIND"
->Chapter 10. Unified Logons between Windows NT and UNIX using Winbind</A
+>Chapter 11. Unified Logons between Windows NT and UNIX using Winbind</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1810"
->10.1. Abstract</A
+NAME="AEN1945"
+>11.1. Abstract</A
 ></H1
 ><P
 >Integration of UNIX and Microsoft Windows NT through 
@@ -8599,8 +9167,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1814"
->10.2. Introduction</A
+NAME="AEN1949"
+>11.2. Introduction</A
 ></H1
 ><P
 >It is well known that UNIX and Microsoft Windows NT have 
@@ -8653,8 +9221,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1827"
->10.3. What Winbind Provides</A
+NAME="AEN1962"
+>11.3. What Winbind Provides</A
 ></H1
 ><P
 >Winbind unifies UNIX and Windows NT account management by 
@@ -8695,8 +9263,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1834"
->10.3.1. Target Uses</A
+NAME="AEN1969"
+>11.3.1. Target Uses</A
 ></H2
 ><P
 >Winbind is targeted at organizations that have an 
@@ -8719,8 +9287,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1838"
->10.4. How Winbind Works</A
+NAME="AEN1973"
+>11.4. How Winbind Works</A
 ></H1
 ><P
 >The winbind system is designed around a client/server 
@@ -8739,8 +9307,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1843"
->10.4.1. Microsoft Remote Procedure Calls</A
+NAME="AEN1978"
+>11.4.1. Microsoft Remote Procedure Calls</A
 ></H2
 ><P
 >Over the last two years, efforts have been underway 
@@ -8765,8 +9333,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1847"
->10.4.2. Name Service Switch</A
+NAME="AEN1982"
+>11.4.2. Name Service Switch</A
 ></H2
 ><P
 >The Name Service Switch, or NSS, is a feature that is 
@@ -8845,8 +9413,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1863"
->10.4.3. Pluggable Authentication Modules</A
+NAME="AEN1998"
+>11.4.3. Pluggable Authentication Modules</A
 ></H2
 ><P
 >Pluggable Authentication Modules, also known as PAM, 
@@ -8894,8 +9462,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1871"
->10.4.4. User and Group ID Allocation</A
+NAME="AEN2006"
+>11.4.4. User and Group ID Allocation</A
 ></H2
 ><P
 >When a user or group is created under Windows NT 
@@ -8920,8 +9488,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1875"
->10.4.5. Result Caching</A
+NAME="AEN2010"
+>11.4.5. Result Caching</A
 ></H2
 ><P
 >An active system can generate a lot of user and group 
@@ -8943,8 +9511,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1878"
->10.5. Installation and Configuration</A
+NAME="AEN2013"
+>11.5. Installation and Configuration</A
 ></H1
 ><P
 >Many thanks to John Trostel <A
@@ -8962,8 +9530,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1883"
->10.5.1. Introduction</A
+NAME="AEN2018"
+>11.5.1. Introduction</A
 ></H2
 ><P
 >This HOWTO describes the procedures used to get winbind up and 
@@ -9013,8 +9581,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1896"
->10.5.2. Requirements</A
+NAME="AEN2031"
+>11.5.2. Requirements</A
 ></H2
 ><P
 >If you have a samba configuration file that you are currently 
@@ -9071,8 +9639,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1910"
->10.5.3. Testing Things Out</A
+NAME="AEN2045"
+>11.5.3. Testing Things Out</A
 ></H2
 ><P
 >Before starting, it is probably best to kill off all the SAMBA 
@@ -9116,8 +9684,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1921"
->10.5.3.1. Configure and compile SAMBA</A
+NAME="AEN2056"
+>11.5.3.1. Configure and compile SAMBA</A
 ></H3
 ><P
 >The configuration and compilation of SAMBA is pretty straightforward.
@@ -9191,8 +9759,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1940"
->10.5.3.2. Configure <TT
+NAME="AEN2075"
+>11.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
 > and the 
@@ -9281,8 +9849,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1965"
->10.5.3.3. Configure smb.conf</A
+NAME="AEN2100"
+>11.5.3.3. Configure smb.conf</A
 ></H3
 ><P
 >Several parameters are needed in the smb.conf file to control 
@@ -9365,8 +9933,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1981"
->10.5.3.4. Join the SAMBA server to the PDC domain</A
+NAME="AEN2116"
+>11.5.3.4. Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
 >Enter the following command to make the SAMBA server join the 
@@ -9411,8 +9979,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1992"
->10.5.3.5. Start up the winbindd daemon and test it!</A
+NAME="AEN2127"
+>11.5.3.5. Start up the winbindd daemon and test it!</A
 ></H3
 ><P
 >Eventually, you will want to modify your smb startup script to 
@@ -9481,7 +10049,7 @@ CEO+TsInternetUser</PRE
 >Obviously, I have named my domain 'CEO' and my <TT
 CLASS="PARAMETER"
 ><I
->winbindd
+>winbind
 separator</I
 ></TT
 > is '+'.</P
@@ -9552,8 +10120,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2028"
->10.5.3.6. Fix the <TT
+NAME="AEN2163"
+>11.5.3.6. Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
 > startup files</A
@@ -9682,8 +10250,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2050"
->10.5.3.7. Configure Winbind and PAM</A
+NAME="AEN2185"
+>11.5.3.7. Configure Winbind and PAM</A
 ></H3
 ><P
 >If you have made it this far, you know that winbindd and samba are working
@@ -9904,8 +10472,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2097"
->10.6. Limitations</A
+NAME="AEN2232"
+>11.6. Limitations</A
 ></H1
 ><P
 >Winbind has a number of limitations in its current 
@@ -9945,8 +10513,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2107"
->10.7. Conclusion</A
+NAME="AEN2242"
+>11.7. Conclusion</A
 ></H1
 ><P
 >The winbind system, through the use of the Name Service 
@@ -9962,23 +10530,23 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="OS2"
->Chapter 11. OS2 Client HOWTO</A
+>Chapter 12. OS2 Client HOWTO</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2121"
->11.1. FAQs</A
+NAME="AEN2256"
+>12.1. FAQs</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2123"
->11.1.1. How can I configure OS/2 Warp Connect or 
+NAME="AEN2258"
+>12.1.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
 ><P
@@ -10036,8 +10604,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2138"
->11.1.2. How can I configure OS/2 Warp 3 (not Connect), 
+NAME="AEN2273"
+>12.1.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></H2
 ><P
@@ -10089,8 +10657,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2147"
->11.1.3. Are there any other issues when OS/2 (any version) 
+NAME="AEN2282"
+>12.1.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
 ><P
@@ -10111,8 +10679,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2151"
->11.1.4. How do I get printer driver download working 
+NAME="AEN2286"
+>12.1.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
 ><P
@@ -10160,15 +10728,15 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="CVS-ACCESS"
->Chapter 12. HOWTO Access Samba source code via CVS</A
+>Chapter 13. HOWTO Access Samba source code via CVS</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2167"
->12.1. Introduction</A
+NAME="AEN2302"
+>13.1. Introduction</A
 ></H1
 ><P
 >Samba is developed in an open environment.  Developers use CVS
@@ -10189,8 +10757,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2172"
->12.2. CVS Access to samba.org</A
+NAME="AEN2307"
+>13.2. CVS Access to samba.org</A
 ></H1
 ><P
 >The machine samba.org runs a publicly accessible CVS 
@@ -10202,8 +10770,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2175"
->12.2.1. Access via CVSweb</A
+NAME="AEN2310"
+>13.2.1. Access via CVSweb</A
 ></H2
 ><P
 >You can access the source code via your 
@@ -10223,8 +10791,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2180"
->12.2.2. Access via cvs</A
+NAME="AEN2315"
+>13.2.2. Access via cvs</A
 ></H2
 ><P
 >You can also access the source code via a 
@@ -10329,7 +10897,7 @@ CLASS="COMMAND"
 ></DIV
 ><HR><H1
 ><A
-NAME="AEN2208"
+NAME="AEN2343"
 >Index</A
 ></H1
 ><DL
diff --git a/docs/htmldocs/Samba-LDAP-HOWTO.html b/docs/htmldocs/Samba-LDAP-HOWTO.html
index 30bd21520af..97c862b7d84 100644
--- a/docs/htmldocs/Samba-LDAP-HOWTO.html
+++ b/docs/htmldocs/Samba-LDAP-HOWTO.html
@@ -152,7 +152,7 @@ Identified (RID).</P
 >As a result of these defeciencies, a more robust means of storing user attributes
 used by smbd was developed.  The API which defines access to user accounts
 is commonly referred to as the samdb interface (previously this was called the passdb
-API, and is still so named in the CVS trees).  In Samba 2.2.3, enabling support
+API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support
 for a samdb backend (e.g. <TT
 CLASS="PARAMETER"
 ><I
diff --git a/docs/htmldocs/UNIX_INSTALL.html b/docs/htmldocs/UNIX_INSTALL.html
index 7194e1154ec..35b1d9b01bc 100644
--- a/docs/htmldocs/UNIX_INSTALL.html
+++ b/docs/htmldocs/UNIX_INSTALL.html
@@ -260,15 +260,15 @@ NAME="AEN63"
 >Step 5: Starting the smbd and nmbd</A
 ></H1
 ><P
->You must choose to start smbd and nmbd either 
+>You must choose to start smbd and nmbd either
 	as daemons or from <B
 CLASS="COMMAND"
 >inetd</B
->. Don't try 
+>. Don't try
 	to do both!  Either you can put them in <TT
 CLASS="FILENAME"
 >	inetd.conf</TT
-> and have them started on demand 
+> and have them started on demand
 	by <B
 CLASS="COMMAND"
 >inetd</B
@@ -276,9 +276,9 @@ CLASS="COMMAND"
 	daemons either from the command line or in <TT
 CLASS="FILENAME"
 >	/etc/rc.local</TT
->. See the man pages for details 
-	on the command line options. Take particular care to read 
-	the bit about what user you need to be in order to start 
+>. See the man pages for details
+	on the command line options. Take particular care to read
+	the bit about what user you need to be in order to start
 	Samba.  In many cases you must be root.</P
 ><P
 >The main advantage of starting <B
@@ -288,9 +288,9 @@ CLASS="COMMAND"
 	and <B
 CLASS="COMMAND"
 >nmbd</B
-> as a daemon is that they will 
-	respond slightly more quickly to an initial connection
-	request. This is, however, unlikely to be a problem.</P
+> using the recommended daemon method
+	is that they will respond slightly more quickly to an initial connection
+	request.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2
diff --git a/docs/htmldocs/smbpasswd.8.html b/docs/htmldocs/smbpasswd.8.html
index c8f97c89d13..dfcb71baed2 100644
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.8.html
@@ -425,6 +425,15 @@ CLASS="FILENAME"
 >smb.conf(5)</TT
 > man page. </P
 ><P
+>This command can work both with and without the -U parameter. </P
+><P
+>When invoked with -U, that username (and optional password) are
+                used to contact the PDC (which must be specified with -r) to both
+                create a machine account, and to set a password on it.</P
+><P
+>Alternately, if -U is omitted, Samba will contact its PDC
+                and attempt to change the password on a pre-existing account. </P
+><P
 >In order to be used in this way, the Administrator for 
 		the Windows NT Domain must have used the program "Server Manager 
 		for Domains" to add the primary NetBIOS name of  the Samba server 
@@ -445,9 +454,10 @@ CLASS="PARAMETER"
 >password server</I
 ></TT
 > and change the machine account 
-		password used to create the secure Domain communication.  This 
-		password is then stored by smbpasswd in a TDB, writeable only by root, 
-		called <TT
+		password used to create the secure Domain communication.  </P
+><P
+>Either way, this password is then stored by smbpasswd in a TDB, 
+                writeable only by root, called <TT
 CLASS="FILENAME"
 >secrets.tdb</TT
 > </P
@@ -464,7 +474,12 @@ CLASS="COMMAND"
 ><P
 >Note that even though the authentication is being 
 		done to the PDC all users accessing the Samba server must still 
-		have a valid UNIX account on that machine. </P
+		have a valid UNIX account on that machine.  
+                The <B
+CLASS="COMMAND"
+>winbindd(8)</B
+> daemon can be used
+                to create UNIX accounts for NT users.</P
 ><P
 >This option is only available when running smbpasswd as root. 
 		</P
@@ -484,6 +499,9 @@ CLASS="PARAMETER"
 		the user name on that machine whose password will be changed. It 
 		is present to allow users who have different user names on 
 		different systems to change these passwords. </P
+><P
+>In particular, this parameter specifies the username
+                used to create the machine account when invoked with -j</P
 ></DD
 ><DT
 >-h</DT
@@ -516,7 +534,7 @@ CLASS="COMMAND"
 ><DD
 ><P
 >This parameter is only available is Samba
-		has been configured to use the experiemental
+		has been configured to use the experimental
 		<B
 CLASS="COMMAND"
 >--with-ldapsam</B
@@ -570,7 +588,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN182"
+NAME="AEN188"
 ></A
 ><H2
 >NOTES</H2
@@ -613,7 +631,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN192"
+NAME="AEN198"
 ></A
 ><H2
 >VERSION</H2
@@ -624,7 +642,7 @@ NAME="AEN192"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN195"
+NAME="AEN201"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -647,7 +665,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN201"
+NAME="AEN207"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/winbind.html b/docs/htmldocs/winbind.html
index 5148b4bc85f..fb83d37a155 100644
--- a/docs/htmldocs/winbind.html
+++ b/docs/htmldocs/winbind.html
@@ -903,7 +903,7 @@ CEO+TsInternetUser</PRE
 >Obviously, I have named my domain 'CEO' and my <TT
 CLASS="PARAMETER"
 ><I
->winbindd
+>winbind
 separator</I
 ></TT
 > is '+'.</P