updated the 2.0 -> 2.2 migration section of the printing chapter.

1 files changed, 189 insertions, 210 deletions

diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 07d7de860f5..c4e4b2c74b5 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -524,17 +524,17 @@ HREF="#DOMAIN-SECURITY"
 ><DL
 ><DT
 >7.1. <A
-HREF="#AEN996"
+HREF="#AEN988"
 >Joining an NT Domain with Samba 2.2</A
 ></DT
 ><DT
 >7.2. <A
-HREF="#AEN1060"
+HREF="#AEN1052"
 >Samba and Windows 2000 Domains</A
 ></DT
 ><DT
 >7.3. <A
-HREF="#AEN1065"
+HREF="#AEN1057"
 >Why is this better than security = server?</A
 ></DT
 ></DL
@@ -548,22 +548,22 @@ HREF="#SAMBA-PDC"
 ><DL
 ><DT
 >8.1. <A
-HREF="#AEN1098"
+HREF="#AEN1090"
 >Prerequisite Reading</A
 ></DT
 ><DT
 >8.2. <A
-HREF="#AEN1104"
+HREF="#AEN1096"
 >Background</A
 ></DT
 ><DT
 >8.3. <A
-HREF="#AEN1146"
+HREF="#AEN1138"
 >Configuring the Samba Domain Controller</A
 ></DT
 ><DT
 >8.4. <A
-HREF="#AEN1188"
+HREF="#AEN1180"
 >Creating Machine Trust Accounts and Joining Clients 
 to the Domain</A
 ></DT
@@ -571,83 +571,83 @@ to the Domain</A
 ><DL
 ><DT
 >8.4.1. <A
-HREF="#AEN1202"
+HREF="#AEN1194"
 >Manually creating machine trust accounts</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="#AEN1233"
+HREF="#AEN1225"
 >Creating machine trust accounts "on the fly"</A
 ></DT
 ></DL
 ></DD
 ><DT
 >8.5. <A
-HREF="#AEN1244"
+HREF="#AEN1236"
 >Common Problems and Errors</A
 ></DT
 ><DT
 >8.6. <A
-HREF="#AEN1292"
+HREF="#AEN1284"
 >System Policies and Profiles</A
 ></DT
 ><DT
 >8.7. <A
-HREF="#AEN1336"
+HREF="#AEN1328"
 >What other help can I get ?</A
 ></DT
 ><DT
 >8.8. <A
-HREF="#AEN1450"
+HREF="#AEN1442"
 >Domain Control for Windows 9x/ME</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.8.1. <A
-HREF="#AEN1480"
+HREF="#AEN1472"
 >Configuration Instructions:	Network Logons</A
 ></DT
 ><DT
 >8.8.2. <A
-HREF="#AEN1514"
+HREF="#AEN1506"
 >Configuration Instructions:	Setting up Roaming User Profiles</A
 ></DT
 ><DD
 ><DL
 ><DT
 >8.8.2.1. <A
-HREF="#AEN1522"
+HREF="#AEN1514"
 >Windows NT Configuration</A
 ></DT
 ><DT
 >8.8.2.2. <A
-HREF="#AEN1530"
+HREF="#AEN1522"
 >Windows 9X Configuration</A
 ></DT
 ><DT
 >8.8.2.3. <A
-HREF="#AEN1538"
+HREF="#AEN1530"
 >Win9X and WinNT Configuration</A
 ></DT
 ><DT
 >8.8.2.4. <A
-HREF="#AEN1545"
+HREF="#AEN1537"
 >Windows 9X Profile Setup</A
 ></DT
 ><DT
 >8.8.2.5. <A
-HREF="#AEN1581"
+HREF="#AEN1573"
 >Windows NT Workstation 4.0</A
 ></DT
 ><DT
 >8.8.2.6. <A
-HREF="#AEN1594"
+HREF="#AEN1586"
 >Windows NT Server</A
 ></DT
 ><DT
 >8.8.2.7. <A
-HREF="#AEN1597"
+HREF="#AEN1589"
 >Sharing Profiles between W95 and NT Workstation 4.0</A
 ></DT
 ></DL
@@ -656,7 +656,7 @@ HREF="#AEN1597"
 ></DD
 ><DT
 >8.9. <A
-HREF="#AEN1607"
+HREF="#AEN1599"
 >DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></DT
 ></DL
@@ -670,119 +670,119 @@ HREF="#WINBIND"
 ><DL
 ><DT
 >9.1. <A
-HREF="#AEN1650"
+HREF="#AEN1642"
 >Abstract</A
 ></DT
 ><DT
 >9.2. <A
-HREF="#AEN1654"
+HREF="#AEN1646"
 >Introduction</A
 ></DT
 ><DT
 >9.3. <A
-HREF="#AEN1667"
+HREF="#AEN1659"
 >What Winbind Provides</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.3.1. <A
-HREF="#AEN1674"
+HREF="#AEN1666"
 >Target Uses</A
 ></DT
 ></DL
 ></DD
 ><DT
 >9.4. <A
-HREF="#AEN1678"
+HREF="#AEN1670"
 >How Winbind Works</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.4.1. <A
-HREF="#AEN1683"
+HREF="#AEN1675"
 >Microsoft Remote Procedure Calls</A
 ></DT
 ><DT
 >9.4.2. <A
-HREF="#AEN1687"
+HREF="#AEN1679"
 >Name Service Switch</A
 ></DT
 ><DT
 >9.4.3. <A
-HREF="#AEN1703"
+HREF="#AEN1695"
 >Pluggable Authentication Modules</A
 ></DT
 ><DT
 >9.4.4. <A
-HREF="#AEN1711"
+HREF="#AEN1703"
 >User and Group ID Allocation</A
 ></DT
 ><DT
 >9.4.5. <A
-HREF="#AEN1715"
+HREF="#AEN1707"
 >Result Caching</A
 ></DT
 ></DL
 ></DD
 ><DT
 >9.5. <A
-HREF="#AEN1718"
+HREF="#AEN1710"
 >Installation and Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.5.1. <A
-HREF="#AEN1723"
+HREF="#AEN1715"
 >Introduction</A
 ></DT
 ><DT
 >9.5.2. <A
-HREF="#AEN1736"
+HREF="#AEN1728"
 >Requirements</A
 ></DT
 ><DT
 >9.5.3. <A
-HREF="#AEN1744"
+HREF="#AEN1736"
 >Testing Things Out</A
 ></DT
 ><DD
 ><DL
 ><DT
 >9.5.3.1. <A
-HREF="#AEN1753"
+HREF="#AEN1745"
 >Configure and compile SAMBA</A
 ></DT
 ><DT
 >9.5.3.2. <A
-HREF="#AEN1765"
+HREF="#AEN1757"
 >Configure nsswitch.conf and the winbind libraries</A
 ></DT
 ><DT
 >9.5.3.3. <A
-HREF="#AEN1784"
+HREF="#AEN1776"
 >Configure smb.conf</A
 ></DT
 ><DT
 >9.5.3.4. <A
-HREF="#AEN1793"
+HREF="#AEN1785"
 >Join the SAMBA server to the PDC domain</A
 ></DT
 ><DT
 >9.5.3.5. <A
-HREF="#AEN1803"
+HREF="#AEN1795"
 >Start up the winbindd daemon and test it!</A
 ></DT
 ><DT
 >9.5.3.6. <A
-HREF="#AEN1830"
+HREF="#AEN1822"
 >Fix the /etc/rc.d/init.d/smb startup files</A
 ></DT
 ><DT
 >9.5.3.7. <A
-HREF="#AEN1847"
+HREF="#AEN1839"
 >Configure Winbind and PAM</A
 ></DT
 ></DL
@@ -791,12 +791,12 @@ HREF="#AEN1847"
 ></DD
 ><DT
 >9.6. <A
-HREF="#AEN1888"
+HREF="#AEN1880"
 >Limitations</A
 ></DT
 ><DT
 >9.7. <A
-HREF="#AEN1898"
+HREF="#AEN1890"
 >Conclusion</A
 ></DT
 ></DL
@@ -810,32 +810,32 @@ HREF="#OS2"
 ><DL
 ><DT
 >10.1. <A
-HREF="#AEN1912"
+HREF="#AEN1904"
 >FAQs</A
 ></DT
 ><DD
 ><DL
 ><DT
 >10.1.1. <A
-HREF="#AEN1914"
+HREF="#AEN1906"
 >How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></DT
 ><DT
 >10.1.2. <A
-HREF="#AEN1929"
+HREF="#AEN1921"
 >How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></DT
 ><DT
 >10.1.3. <A
-HREF="#AEN1938"
+HREF="#AEN1930"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
 >10.1.4. <A
-HREF="#AEN1942"
+HREF="#AEN1934"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
@@ -852,24 +852,24 @@ HREF="#CVS-ACCESS"
 ><DL
 ><DT
 >11.1. <A
-HREF="#AEN1958"
+HREF="#AEN1950"
 >Introduction</A
 ></DT
 ><DT
 >11.2. <A
-HREF="#AEN1963"
+HREF="#AEN1955"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
 >11.2.1. <A
-HREF="#AEN1966"
+HREF="#AEN1958"
 >Access via CVSweb</A
 ></DT
 ><DT
 >11.2.2. <A
-HREF="#AEN1971"
+HREF="#AEN1963"
 >Access via cvs</A
 ></DT
 ></DL
@@ -878,7 +878,7 @@ HREF="#AEN1971"
 ></DD
 ><DT
 ><A
-HREF="#AEN1999"
+HREF="#AEN1991"
 >Index</A
 ></DT
 ></DL
@@ -5012,51 +5012,67 @@ NAME="MIGRATION"
 ><P
 >Given that printer driver management has changed (we hope improved) in 
 2.2 over prior releases, migration from an existing setup to 2.2 can 
-follow several paths.</P
+follow several paths. Here are the possible scenarios for 
+migration:</P
 ><P
->Windows clients have a tendency to remember things for quite a while.
-For example, if a Windows NT client has attached to a Samba 2.0 server,
-it will remember the server as a LanMan printer server.  Upgrading 
-the Samba host to 2.2 makes support for MSRPC printing possible, but 
-the NT client will still remember the previous setting.</P
+></P
+><UL
+><LI
 ><P
->In order to give an NT client printing "amnesia" (only necessary if you 
-want to use the newer MSRPC printing functionality in Samba), delete 
-the registry keys associated with the print server contained in 
-<TT
-CLASS="CONSTANT"
->[HKLM\SYSTEM\CurrentControlSet\Control\Print]</TT
->.  The 
-spooler service on the client should be stopped prior to doing this:</P
+>If you do not desire the new Windows NT 
+	print driver support, nothing needs to be done.  
+	All existing parameters work the same.</P
+></LI
+><LI
 ><P
-><TT
-CLASS="PROMPT"
->C:\WINNT\ &#62;</TT
-> <TT
-CLASS="USERINPUT"
-><B
->net stop spooler</B
-></TT
-></P
+>If you want to take advantage of NT printer 
+	driver support but do not want to migrate the 
+	9x drivers to the new setup, the leave the existing 
+	<TT
+CLASS="FILENAME"
+>printers.def</TT
+> file.  When smbd attempts 
+	to locate a 
+	9x driver for the printer in the TDB and fails it 
+	will drop down to using the printers.def (and all 
+	associated parameters).  The <B
+CLASS="COMMAND"
+>make_printerdef</B
+> 
+	tool will also remain for backwards compatibility but will 
+	be removed in the next major release.</P
+></LI
+><LI
 ><P
-><EM
->All the normal disclaimers about editing the registry go 
-here.</EM
->  Be careful, and know what you are doing.</P
+>If you install a Windows 9x driver for a printer 
+	on your Samba host (in the printing TDB), this information will 
+	take precedence and the three old printing parameters
+	will be ignored (including print driver location).</P
+></LI
+><LI
 ><P
->The spooler service should be restarted after you have finished 
-removing the appropriate registry entries by replacing the 
-<B
+>If you want to migrate an existing <TT
+CLASS="FILENAME"
+>printers.def</TT
+> 
+	file into the new setup, the current only solution is to use the Windows 
+	NT APW to install the NT drivers and the 9x  drivers.  This can be scripted 
+	using <B
 CLASS="COMMAND"
->stop</B
-> command above with <B
+>smbclient</B
+> and <B
 CLASS="COMMAND"
->start</B
->.</P
-><P
->Windows 9x clients will continue to use LanMan printing calls
-with a 2.2 Samba server so there is no need to perform any of these
-modifications on non-NT clients.</P
+>rpcclient</B
+>.  See the 
+	Imprints installation client at <A
+HREF="http://imprints.sourceforge.net/"
+TARGET="_top"
+>http://imprints.sourceforge.net/</A
+> 
+	for an example.
+	</P
+></LI
+></UL
 ><DIV
 CLASS="WARNING"
 ><P
@@ -5076,8 +5092,12 @@ ALIGN="CENTER"
 ><TD
 ALIGN="LEFT"
 ><P
->The following smb.conf parameters are considered to be depreciated and will 
-be removed soon.  Do not use them in new installations</P
+>The following <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> parameters are considered to 
+be deprecated and will be removed soon.  Do not use them in new 
+installations</P
 ><P
 ></P
 ><UL
@@ -5117,63 +5137,22 @@ CLASS="PARAMETER"
 ></TABLE
 ></DIV
 ><P
->Here are the possible scenarios for supporting migration:</P
-><P
-></P
-><UL
-><LI
-><P
->If you do not desire the new Windows NT 
-	print driver support, nothing needs to be done.  
-	All existing parameters work the same.</P
-></LI
-><LI
-><P
->If you want to take advantage of NT printer 
-	driver support but do not want to migrate the 
-	9x drivers to the new setup, the leave the existing 
-	printers.def file.  When smbd attempts to locate a 
-	9x driver for the printer in the TDB and fails it 
-	will drop down to using the printers.def (and all 
-	associated parameters).  The <B
-CLASS="COMMAND"
->make_printerdef</B
-> 
-	tool will also remain for backwards compatibility but will 
-	be moved to the "this tool is the old way of doing it" 
-	pile.</P
-></LI
-><LI
-><P
->If you install a Windows 9x driver for a printer 
-	on your Samba host (in the printing TDB), this information will 
-	take precedence and the three old printing parameters
-	will be ignored (including print driver location).</P
-></LI
-><LI
-><P
->If you want to migrate an existing <TT
-CLASS="FILENAME"
->printers.def</TT
-> 
-	file into the new setup, the current only solution is to use the Windows 
-	NT APW to install the NT drivers and the 9x  drivers.  This can be scripted 
-	using <B
-CLASS="COMMAND"
->smbclient</B
-> and <B
-CLASS="COMMAND"
->rpcclient</B
->.  See the 
-	Imprints installation client at <A
-HREF="http://imprints.sourceforge.net/"
-TARGET="_top"
->http://imprints.sourceforge.net/</A
-> 
-	for an example.
-	</P
-></LI
-></UL
+>The have been two new parameters add in Samba 2.2.2 to for 
+better support of Samba 2.0.x backwards capability (<TT
+CLASS="PARAMETER"
+><I
+>disable
+spoolss</I
+></TT
+>) and for using local printers drivers on Windows 
+NT/2000 clients (<TT
+CLASS="PARAMETER"
+><I
+>use client driver</I
+></TT
+>). Both of 
+these options are described in the smb.coinf(5) man page and are 
+disabled by default.</P
 ></DIV
 ></DIV
 ><DIV
@@ -5188,7 +5167,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN996"
+NAME="AEN988"
 >7.1. Joining an NT Domain with Samba 2.2</A
 ></H1
 ><P
@@ -5415,7 +5394,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1060"
+NAME="AEN1052"
 >7.2. Samba and Windows 2000 Domains</A
 ></H1
 ><P
@@ -5440,7 +5419,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1065"
+NAME="AEN1057"
 >7.3. Why is this better than security = server?</A
 ></H1
 ><P
@@ -5534,7 +5513,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1098"
+NAME="AEN1090"
 >8.1. Prerequisite Reading</A
 ></H1
 ><P
@@ -5562,7 +5541,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1104"
+NAME="AEN1096"
 >8.2. Background</A
 ></H1
 ><DIV
@@ -5719,7 +5698,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1146"
+NAME="AEN1138"
 >8.3. Configuring the Samba Domain Controller</A
 ></H1
 ><P
@@ -5936,7 +5915,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1188"
+NAME="AEN1180"
 >8.4. Creating Machine Trust Accounts and Joining Clients 
 to the Domain</A
 ></H1
@@ -5994,7 +5973,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1202"
+NAME="AEN1194"
 >8.4.1. Manually creating machine trust accounts</A
 ></H2
 ><P
@@ -6145,7 +6124,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1233"
+NAME="AEN1225"
 >8.4.2. Creating machine trust accounts "on the fly"</A
 ></H2
 ><P
@@ -6193,7 +6172,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1244"
+NAME="AEN1236"
 >8.5. Common Problems and Errors</A
 ></H1
 ><P
@@ -6392,7 +6371,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1292"
+NAME="AEN1284"
 >8.6. System Policies and Profiles</A
 ></H1
 ><P
@@ -6549,7 +6528,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1336"
+NAME="AEN1328"
 >8.7. What other help can I get ?</A
 ></H1
 ><P
@@ -6945,7 +6924,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1450"
+NAME="AEN1442"
 >8.8. Domain Control for Windows 9x/ME</A
 ></H1
 ><DIV
@@ -7081,7 +7060,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1480"
+NAME="AEN1472"
 >8.8.1. Configuration Instructions:	Network Logons</A
 ></H2
 ><P
@@ -7270,7 +7249,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1514"
+NAME="AEN1506"
 >8.8.2. Configuration Instructions:	Setting up Roaming User Profiles</A
 ></H2
 ><DIV
@@ -7317,7 +7296,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1522"
+NAME="AEN1514"
 >8.8.2.1. Windows NT Configuration</A
 ></H3
 ><P
@@ -7361,7 +7340,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1530"
+NAME="AEN1522"
 >8.8.2.2. Windows 9X Configuration</A
 ></H3
 ><P
@@ -7401,7 +7380,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1538"
+NAME="AEN1530"
 >8.8.2.3. Win9X and WinNT Configuration</A
 ></H3
 ><P
@@ -7439,7 +7418,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1545"
+NAME="AEN1537"
 >8.8.2.4. Windows 9X Profile Setup</A
 ></H3
 ><P
@@ -7595,7 +7574,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1581"
+NAME="AEN1573"
 >8.8.2.5. Windows NT Workstation 4.0</A
 ></H3
 ><P
@@ -7677,7 +7656,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1594"
+NAME="AEN1586"
 >8.8.2.6. Windows NT Server</A
 ></H3
 ><P
@@ -7691,7 +7670,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1597"
+NAME="AEN1589"
 >8.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</A
 ></H3
 ><DIV
@@ -7756,7 +7735,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1607"
+NAME="AEN1599"
 >8.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></H1
 ><DIV
@@ -7885,7 +7864,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1650"
+NAME="AEN1642"
 >9.1. Abstract</A
 ></H1
 ><P
@@ -7908,7 +7887,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1654"
+NAME="AEN1646"
 >9.2. Introduction</A
 ></H1
 ><P
@@ -7962,7 +7941,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1667"
+NAME="AEN1659"
 >9.3. What Winbind Provides</A
 ></H1
 ><P
@@ -8004,7 +7983,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1674"
+NAME="AEN1666"
 >9.3.1. Target Uses</A
 ></H2
 ><P
@@ -8028,7 +8007,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1678"
+NAME="AEN1670"
 >9.4. How Winbind Works</A
 ></H1
 ><P
@@ -8048,7 +8027,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1683"
+NAME="AEN1675"
 >9.4.1. Microsoft Remote Procedure Calls</A
 ></H2
 ><P
@@ -8074,7 +8053,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1687"
+NAME="AEN1679"
 >9.4.2. Name Service Switch</A
 ></H2
 ><P
@@ -8154,7 +8133,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1703"
+NAME="AEN1695"
 >9.4.3. Pluggable Authentication Modules</A
 ></H2
 ><P
@@ -8203,7 +8182,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1711"
+NAME="AEN1703"
 >9.4.4. User and Group ID Allocation</A
 ></H2
 ><P
@@ -8229,7 +8208,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1715"
+NAME="AEN1707"
 >9.4.5. Result Caching</A
 ></H2
 ><P
@@ -8252,7 +8231,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1718"
+NAME="AEN1710"
 >9.5. Installation and Configuration</A
 ></H1
 ><P
@@ -8271,7 +8250,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1723"
+NAME="AEN1715"
 >9.5.1. Introduction</A
 ></H2
 ><P
@@ -8322,7 +8301,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1736"
+NAME="AEN1728"
 >9.5.2. Requirements</A
 ></H2
 ><P
@@ -8362,7 +8341,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1744"
+NAME="AEN1736"
 >9.5.3. Testing Things Out</A
 ></H2
 ><P
@@ -8400,7 +8379,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1753"
+NAME="AEN1745"
 >9.5.3.1. Configure and compile SAMBA</A
 ></H3
 ><P
@@ -8454,7 +8433,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1765"
+NAME="AEN1757"
 >9.5.3.2. Configure nsswitch.conf and the winbind libraries</A
 ></H3
 ><P
@@ -8524,7 +8503,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1784"
+NAME="AEN1776"
 >9.5.3.3. Configure smb.conf</A
 ></H3
 ><P
@@ -8579,7 +8558,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1793"
+NAME="AEN1785"
 >9.5.3.4. Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
@@ -8622,7 +8601,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1803"
+NAME="AEN1795"
 >9.5.3.5. Start up the winbindd daemon and test it!</A
 ></H3
 ><P
@@ -8736,7 +8715,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1830"
+NAME="AEN1822"
 >9.5.3.6. Fix the /etc/rc.d/init.d/smb startup files</A
 ></H3
 ><P
@@ -8849,7 +8828,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1847"
+NAME="AEN1839"
 >9.5.3.7. Configure Winbind and PAM</A
 ></H3
 ><P
@@ -9061,7 +9040,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1888"
+NAME="AEN1880"
 >9.6. Limitations</A
 ></H1
 ><P
@@ -9102,7 +9081,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1898"
+NAME="AEN1890"
 >9.7. Conclusion</A
 ></H1
 ><P
@@ -9126,7 +9105,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1912"
+NAME="AEN1904"
 >10.1. FAQs</A
 ></H1
 ><DIV
@@ -9134,7 +9113,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1914"
+NAME="AEN1906"
 >10.1.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
@@ -9193,7 +9172,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1929"
+NAME="AEN1921"
 >10.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
@@ -9246,7 +9225,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1938"
+NAME="AEN1930"
 >10.1.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
@@ -9268,7 +9247,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1942"
+NAME="AEN1934"
 >10.1.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
@@ -9324,7 +9303,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1958"
+NAME="AEN1950"
 >11.1. Introduction</A
 ></H1
 ><P
@@ -9346,7 +9325,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1963"
+NAME="AEN1955"
 >11.2. CVS Access to samba.org</A
 ></H1
 ><P
@@ -9359,7 +9338,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1966"
+NAME="AEN1958"
 >11.2.1. Access via CVSweb</A
 ></H2
 ><P
@@ -9380,7 +9359,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1971"
+NAME="AEN1963"
 >11.2.2. Access via cvs</A
 ></H2
 ><P
@@ -9486,14 +9465,14 @@ CLASS="COMMAND"
 ></DIV
 ><HR><H1
 ><A
-NAME="AEN1999"
+NAME="AEN1991"
 >Index</A
 ></H1
 ><DL
 ><DT
 >Primary  Domain Controller,
     <A
-HREF="x1104.htm"
+HREF="x1096.htm"
 >Background</A
 >
   </DT