From 1e6e5b299c235b513095a76a4cd9fffc41e8fc9c Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 17 Jun 2002 18:36:36 +0000
Subject: beginning to sync up for 2.2.5 release....

---
 docs/htmldocs/Samba-HOWTO-Collection.html | 2679 +++++++++++++++++++----------
 docs/htmldocs/UNIX_INSTALL.html           |    2 +-
 docs/htmldocs/cups.html                   |  588 +++++++
 docs/htmldocs/nmblookup.1.html            |   23 +-
 docs/htmldocs/smb.conf.5.html             |  259 ++-
 docs/htmldocs/smbcontrol.1.html           |   32 +-
 docs/htmldocs/smbpasswd.5.html            |    2 +-
 docs/htmldocs/smbpasswd.8.html            |   79 +-
 docs/htmldocs/winbind.html                |   32 +-
 9 files changed, 2691 insertions(+), 1005 deletions(-)
 create mode 100644 docs/htmldocs/cups.html

(limited to 'docs/htmldocs')

diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index d6c92a65cab..2e293287534 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -178,12 +178,12 @@ HREF="#AEN199"
 ></DT
 ><DT
 >1.10.6. <A
-HREF="#AEN209"
+HREF="#AEN208"
 >Mapping Usernames</A
 ></DT
 ><DT
 >1.10.7. <A
-HREF="#AEN212"
+HREF="#AEN211"
 >Other Character Sets</A
 ></DT
 ></DL
@@ -199,19 +199,19 @@ HREF="#INTEGRATE-MS-NETWORKS"
 ><DL
 ><DT
 >2.1. <A
-HREF="#AEN226"
+HREF="#AEN225"
 >Agenda</A
 ></DT
 ><DT
 >2.2. <A
-HREF="#AEN248"
+HREF="#AEN247"
 >Name Resolution in a pure Unix/Linux world</A
 ></DT
 ><DD
 ><DL
 ><DT
 >2.2.1. <A
-HREF="#AEN264"
+HREF="#AEN263"
 ><TT
 CLASS="FILENAME"
 >/etc/hosts</TT
@@ -219,7 +219,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >2.2.2. <A
-HREF="#AEN280"
+HREF="#AEN279"
 ><TT
 CLASS="FILENAME"
 >/etc/resolv.conf</TT
@@ -227,7 +227,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >2.2.3. <A
-HREF="#AEN291"
+HREF="#AEN290"
 ><TT
 CLASS="FILENAME"
 >/etc/host.conf</TT
@@ -235,7 +235,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >2.2.4. <A
-HREF="#AEN299"
+HREF="#AEN298"
 ><TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
@@ -245,47 +245,47 @@ CLASS="FILENAME"
 ></DD
 ><DT
 >2.3. <A
-HREF="#AEN311"
+HREF="#AEN310"
 >Name resolution as used within MS Windows networking</A
 ></DT
 ><DD
 ><DL
 ><DT
 >2.3.1. <A
-HREF="#AEN323"
+HREF="#AEN322"
 >The NetBIOS Name Cache</A
 ></DT
 ><DT
 >2.3.2. <A
-HREF="#AEN328"
+HREF="#AEN327"
 >The LMHOSTS file</A
 ></DT
 ><DT
 >2.3.3. <A
-HREF="#AEN336"
+HREF="#AEN335"
 >HOSTS file</A
 ></DT
 ><DT
 >2.3.4. <A
-HREF="#AEN341"
+HREF="#AEN340"
 >DNS Lookup</A
 ></DT
 ><DT
 >2.3.5. <A
-HREF="#AEN344"
+HREF="#AEN343"
 >WINS Lookup</A
 ></DT
 ></DL
 ></DD
 ><DT
 >2.4. <A
-HREF="#AEN356"
+HREF="#AEN355"
 >How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></DT
 ><DT
 >2.5. <A
-HREF="#AEN366"
+HREF="#AEN365"
 >MS Windows security options and how to configure 
 Samba for seemless integration</A
 ></DT
@@ -293,29 +293,29 @@ Samba for seemless integration</A
 ><DL
 ><DT
 >2.5.1. <A
-HREF="#AEN394"
+HREF="#AEN393"
 >Use MS Windows NT as an authentication server</A
 ></DT
 ><DT
 >2.5.2. <A
-HREF="#AEN402"
+HREF="#AEN401"
 >Make Samba a member of an MS Windows NT security domain</A
 ></DT
 ><DT
 >2.5.3. <A
-HREF="#AEN419"
+HREF="#AEN418"
 >Configure Samba as an authentication server</A
 ></DT
 ><DD
 ><DL
 ><DT
 >2.5.3.1. <A
-HREF="#AEN426"
+HREF="#AEN425"
 >Users</A
 ></DT
 ><DT
 >2.5.3.2. <A
-HREF="#AEN431"
+HREF="#AEN430"
 >MS Windows NT Machine Accounts</A
 ></DT
 ></DL
@@ -324,7 +324,7 @@ HREF="#AEN431"
 ></DD
 ><DT
 >2.6. <A
-HREF="#AEN436"
+HREF="#AEN435"
 >Conclusions</A
 ></DT
 ></DL
@@ -339,17 +339,17 @@ managed authentication</A
 ><DL
 ><DT
 >3.1. <A
-HREF="#AEN457"
+HREF="#AEN456"
 >Samba and PAM</A
 ></DT
 ><DT
 >3.2. <A
-HREF="#AEN501"
+HREF="#AEN500"
 >Distributed Authentication</A
 ></DT
 ><DT
 >3.3. <A
-HREF="#AEN508"
+HREF="#AEN507"
 >PAM Configuration in smb.conf</A
 ></DT
 ></DL
@@ -363,14 +363,14 @@ HREF="#MSDFS"
 ><DL
 ><DT
 >4.1. <A
-HREF="#AEN528"
+HREF="#AEN527"
 >Instructions</A
 ></DT
 ><DD
 ><DL
 ><DT
 >4.1.1. <A
-HREF="#AEN563"
+HREF="#AEN562"
 >Notes</A
 ></DT
 ></DL
@@ -386,53 +386,53 @@ HREF="#UNIX-PERMISSIONS"
 ><DL
 ><DT
 >5.1. <A
-HREF="#AEN583"
+HREF="#AEN582"
 >Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></DT
 ><DT
 >5.2. <A
-HREF="#AEN592"
+HREF="#AEN591"
 >How to view file security on a Samba share</A
 ></DT
 ><DT
 >5.3. <A
-HREF="#AEN603"
+HREF="#AEN602"
 >Viewing file ownership</A
 ></DT
 ><DT
 >5.4. <A
-HREF="#AEN623"
+HREF="#AEN622"
 >Viewing file or directory permissions</A
 ></DT
 ><DD
 ><DL
 ><DT
 >5.4.1. <A
-HREF="#AEN638"
+HREF="#AEN637"
 >File Permissions</A
 ></DT
 ><DT
 >5.4.2. <A
-HREF="#AEN652"
+HREF="#AEN651"
 >Directory Permissions</A
 ></DT
 ></DL
 ></DD
 ><DT
 >5.5. <A
-HREF="#AEN659"
+HREF="#AEN658"
 >Modifying file or directory permissions</A
 ></DT
 ><DT
 >5.6. <A
-HREF="#AEN681"
+HREF="#AEN680"
 >Interaction with the standard Samba create mask 
 	parameters</A
 ></DT
 ><DT
 >5.7. <A
-HREF="#AEN745"
+HREF="#AEN744"
 >Interaction with the standard Samba file attribute 
 	mapping</A
 ></DT
@@ -447,220 +447,298 @@ HREF="#PRINTING"
 ><DL
 ><DT
 >6.1. <A
-HREF="#AEN766"
+HREF="#AEN765"
 >Introduction</A
 ></DT
 ><DT
 >6.2. <A
-HREF="#AEN788"
+HREF="#AEN787"
 >Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
 >6.2.1. <A
-HREF="#AEN799"
+HREF="#AEN798"
 >Creating [print$]</A
 ></DT
 ><DT
 >6.2.2. <A
-HREF="#AEN834"
+HREF="#AEN833"
 >Setting Drivers for Existing Printers</A
 ></DT
 ><DT
 >6.2.3. <A
 HREF="#AEN851"
->Support a large number of printers</A
+>DeviceModes and New Printers</A
 ></DT
 ><DT
 >6.2.4. <A
 HREF="#AEN862"
->Adding New Printers via the Windows NT APW</A
+>Support a large number of printers</A
 ></DT
 ><DT
 >6.2.5. <A
-HREF="#AEN887"
+HREF="#AEN873"
+>Adding New Printers via the Windows NT APW</A
+></DT
+><DT
+>6.2.6. <A
+HREF="#AEN898"
 >Samba and Printer Ports</A
 ></DT
 ></DL
 ></DD
 ><DT
 >6.3. <A
-HREF="#AEN895"
+HREF="#AEN906"
 >The Imprints Toolset</A
 ></DT
 ><DD
 ><DL
 ><DT
 >6.3.1. <A
-HREF="#AEN899"
+HREF="#AEN911"
 >What is Imprints?</A
 ></DT
 ><DT
 >6.3.2. <A
-HREF="#AEN909"
+HREF="#AEN921"
 >Creating Printer Driver Packages</A
 ></DT
 ><DT
 >6.3.3. <A
-HREF="#AEN912"
+HREF="#AEN924"
 >The Imprints server</A
 ></DT
 ><DT
 >6.3.4. <A
-HREF="#AEN916"
+HREF="#AEN928"
 >The Installation Client</A
 ></DT
 ></DL
 ></DD
 ><DT
 >6.4. <A
-HREF="#AEN938"
+HREF="#AEN950"
 ><A
 NAME="MIGRATION"
 ></A
 >Migration to from Samba 2.0.x to 2.2.x</A
 ></DT
+><DD
+><DL
+><DT
+>6.4.1. <A
+HREF="#AEN983"
+>Parameters in <TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+> for Backwards Compatibility</A
+></DT
+></DL
+></DD
 ></DL
 ></DD
 ><DT
 >7. <A
+HREF="#CUPS"
+>Printing with CUPS in Samba 2.2.x</A
+></DT
+><DD
+><DL
+><DT
+>7.1. <A
+HREF="#AEN999"
+>Printing with CUPS in Samba 2.2.x</A
+></DT
+><DT
+>7.2. <A
+HREF="#AEN1003"
+>Configuring <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> for CUPS</A
+></DT
+><DT
+>7.3. <A
+HREF="#AEN1022"
+>Using CUPS as a mere spooling print server -- "raw"
+printing with vendor drivers download</A
+></DT
+><DT
+>7.4. <A
+HREF="#AEN1025"
+>CUPS as a network PostScript RIP -- CUPS drivers working on server, Adobe
+PostScript driver with CUPS-PPDs downloaded to clients</A
+></DT
+><DT
+>7.5. <A
+HREF="#AEN1046"
+>Windows Terminal Servers (WTS) as CUPS clients</A
+></DT
+><DT
+>7.6. <A
+HREF="#AEN1050"
+>Setting up CUPS for driver download</A
+></DT
+><DT
+>7.7. <A
+HREF="#AEN1062"
+>Sources of CUPS drivers / PPDs</A
+></DT
+><DD
+><DL
+><DT
+>7.7.1. <A
+HREF="#AEN1089"
+><B
+CLASS="COMMAND"
+>cupsaddsmb</B
+></A
+></DT
+></DL
+></DD
+></DL
+></DD
+><DT
+>8. <A
 HREF="#DOMAIN-SECURITY"
 >security = domain in Samba 2.x</A
 ></DT
 ><DD
 ><DL
 ><DT
->7.1. <A
-HREF="#AEN992"
+>8.1. <A
+HREF="#AEN1134"
 >Joining an NT Domain with Samba 2.2</A
 ></DT
 ><DT
->7.2. <A
-HREF="#AEN1056"
+>8.2. <A
+HREF="#AEN1198"
 >Samba and Windows 2000 Domains</A
 ></DT
 ><DT
->7.3. <A
-HREF="#AEN1061"
+>8.3. <A
+HREF="#AEN1203"
 >Why is this better than security = server?</A
 ></DT
 ></DL
 ></DD
 ><DT
->8. <A
+>9. <A
 HREF="#SAMBA-PDC"
 >How to Configure Samba 2.2 as a Primary Domain Controller</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.1. <A
-HREF="#AEN1094"
+>9.1. <A
+HREF="#AEN1236"
 >Prerequisite Reading</A
 ></DT
 ><DT
->8.2. <A
-HREF="#AEN1100"
+>9.2. <A
+HREF="#AEN1242"
 >Background</A
 ></DT
 ><DT
->8.3. <A
-HREF="#AEN1139"
+>9.3. <A
+HREF="#AEN1281"
 >Configuring the Samba Domain Controller</A
 ></DT
 ><DT
->8.4. <A
-HREF="#AEN1182"
+>9.4. <A
+HREF="#AEN1324"
 >Creating Machine Trust Accounts and Joining Clients to the
 Domain</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.4.1. <A
-HREF="#AEN1201"
+>9.4.1. <A
+HREF="#AEN1343"
 >Manual Creation of Machine Trust Accounts</A
 ></DT
 ><DT
->8.4.2. <A
-HREF="#AEN1236"
+>9.4.2. <A
+HREF="#AEN1378"
 >"On-the-Fly" Creation of Machine Trust Accounts</A
 ></DT
 ><DT
->8.4.3. <A
-HREF="#AEN1245"
+>9.4.3. <A
+HREF="#AEN1387"
 >Joining the Client to the Domain</A
 ></DT
 ></DL
 ></DD
 ><DT
->8.5. <A
-HREF="#AEN1260"
+>9.5. <A
+HREF="#AEN1402"
 >Common Problems and Errors</A
 ></DT
 ><DT
->8.6. <A
-HREF="#AEN1308"
+>9.6. <A
+HREF="#AEN1450"
 >System Policies and Profiles</A
 ></DT
 ><DT
->8.7. <A
-HREF="#AEN1352"
+>9.7. <A
+HREF="#AEN1494"
 >What other help can I get?</A
 ></DT
 ><DT
->8.8. <A
-HREF="#AEN1466"
+>9.8. <A
+HREF="#AEN1608"
 >Domain Control for Windows 9x/ME</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.8.1. <A
-HREF="#AEN1492"
+>9.8.1. <A
+HREF="#AEN1634"
 >Configuration Instructions:	Network Logons</A
 ></DT
 ><DT
->8.8.2. <A
-HREF="#AEN1511"
+>9.8.2. <A
+HREF="#AEN1653"
 >Configuration Instructions:	Setting up Roaming User Profiles</A
 ></DT
 ><DD
 ><DL
 ><DT
->8.8.2.1. <A
-HREF="#AEN1519"
+>9.8.2.1. <A
+HREF="#AEN1661"
 >Windows NT Configuration</A
 ></DT
 ><DT
->8.8.2.2. <A
-HREF="#AEN1527"
+>9.8.2.2. <A
+HREF="#AEN1669"
 >Windows 9X Configuration</A
 ></DT
 ><DT
->8.8.2.3. <A
-HREF="#AEN1535"
+>9.8.2.3. <A
+HREF="#AEN1677"
 >Win9X and WinNT Configuration</A
 ></DT
 ><DT
->8.8.2.4. <A
-HREF="#AEN1542"
+>9.8.2.4. <A
+HREF="#AEN1684"
 >Windows 9X Profile Setup</A
 ></DT
 ><DT
->8.8.2.5. <A
-HREF="#AEN1578"
+>9.8.2.5. <A
+HREF="#AEN1720"
 >Windows NT Workstation 4.0</A
 ></DT
 ><DT
->8.8.2.6. <A
-HREF="#AEN1591"
+>9.8.2.6. <A
+HREF="#AEN1733"
 >Windows NT Server</A
 ></DT
 ><DT
->8.8.2.7. <A
-HREF="#AEN1594"
+>9.8.2.7. <A
+HREF="#AEN1736"
 >Sharing Profiles between W95 and NT Workstation 4.0</A
 ></DT
 ></DL
@@ -668,63 +746,63 @@ HREF="#AEN1594"
 ></DL
 ></DD
 ><DT
->8.9. <A
-HREF="#AEN1604"
+>9.9. <A
+HREF="#AEN1746"
 >DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></DT
 ></DL
 ></DD
 ><DT
->9. <A
+>10. <A
 HREF="#SAMBA-BDC"
 >How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</A
 ></DT
 ><DD
 ><DL
 ><DT
->9.1. <A
-HREF="#AEN1640"
+>10.1. <A
+HREF="#AEN1782"
 >Prerequisite Reading</A
 ></DT
 ><DT
->9.2. <A
-HREF="#AEN1644"
+>10.2. <A
+HREF="#AEN1786"
 >Background</A
 ></DT
 ><DT
->9.3. <A
-HREF="#AEN1652"
+>10.3. <A
+HREF="#AEN1794"
 >What qualifies a Domain Controller on the network?</A
 ></DT
 ><DD
 ><DL
 ><DT
->9.3.1. <A
-HREF="#AEN1655"
+>10.3.1. <A
+HREF="#AEN1797"
 >How does a Workstation find its domain controller?</A
 ></DT
 ><DT
->9.3.2. <A
-HREF="#AEN1658"
+>10.3.2. <A
+HREF="#AEN1800"
 >When is the PDC needed?</A
 ></DT
 ></DL
 ></DD
 ><DT
->9.4. <A
-HREF="#AEN1661"
+>10.4. <A
+HREF="#AEN1803"
 >Can Samba be a Backup Domain Controller?</A
 ></DT
 ><DT
->9.5. <A
-HREF="#AEN1665"
+>10.5. <A
+HREF="#AEN1807"
 >How do I set up a Samba BDC?</A
 ></DT
 ><DD
 ><DL
 ><DT
->9.5.1. <A
-HREF="#AEN1681"
+>10.5.1. <A
+HREF="#AEN1836"
 >How do I replicate the smbpasswd file?</A
 ></DT
 ></DL
@@ -732,207 +810,210 @@ HREF="#AEN1681"
 ></DL
 ></DD
 ><DT
->10. <A
+>11. <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="#AEN1702"
+>11.1. <A
+HREF="#AEN1867"
 >Purpose</A
 ></DT
 ><DT
->10.2. <A
-HREF="#AEN1722"
+>11.2. <A
+HREF="#AEN1888"
 >Introduction</A
 ></DT
 ><DT
->10.3. <A
-HREF="#AEN1751"
+>11.3. <A
+HREF="#AEN1919"
 >Supported LDAP Servers</A
 ></DT
 ><DT
->10.4. <A
-HREF="#AEN1756"
+>11.4. <A
+HREF="#AEN1924"
 >Schema and Relationship to the RFC 2307 posixAccount</A
 ></DT
 ><DT
->10.5. <A
-HREF="#AEN1768"
+>11.5. <A
+HREF="#AEN1945"
 >Configuring Samba with LDAP</A
 ></DT
 ><DD
 ><DL
 ><DT
->10.5.1. <A
-HREF="#AEN1770"
+>11.5.1. <A
+HREF="#AEN1947"
 >OpenLDAP configuration</A
 ></DT
 ><DT
->10.5.2. <A
-HREF="#AEN1787"
+>11.5.2. <A
+HREF="#AEN1964"
 >Configuring Samba</A
 ></DT
+><DT
+>11.5.3. <A
+HREF="#AEN1992"
+>Importing <TT
+CLASS="FILENAME"
+>smbpasswd</TT
+> entries</A
+></DT
 ></DL
 ></DD
 ><DT
->10.6. <A
-HREF="#AEN1815"
+>11.6. <A
+HREF="#AEN2008"
 >Accounts and Groups management</A
 ></DT
 ><DT
->10.7. <A
-HREF="#AEN1820"
+>11.7. <A
+HREF="#AEN2013"
 >Security and sambaAccount</A
 ></DT
 ><DT
->10.8. <A
-HREF="#AEN1840"
+>11.8. <A
+HREF="#AEN2033"
 >LDAP specials attributes for sambaAccounts</A
 ></DT
 ><DT
->10.9. <A
-HREF="#AEN1910"
+>11.9. <A
+HREF="#AEN2103"
 >Example LDIF Entries for a sambaAccount</A
 ></DT
 ><DT
->10.10. <A
-HREF="#AEN1918"
+>11.10. <A
+HREF="#AEN2111"
 >Comments</A
 ></DT
 ></DL
 ></DD
 ><DT
->11. <A
+>12. <A
 HREF="#WINBIND"
 >Unified Logons between Windows NT and UNIX using Winbind</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.1. <A
-HREF="#AEN1947"
+>12.1. <A
+HREF="#AEN2140"
 >Abstract</A
 ></DT
 ><DT
->11.2. <A
-HREF="#AEN1951"
+>12.2. <A
+HREF="#AEN2144"
 >Introduction</A
 ></DT
 ><DT
->11.3. <A
-HREF="#AEN1964"
+>12.3. <A
+HREF="#AEN2157"
 >What Winbind Provides</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.3.1. <A
-HREF="#AEN1971"
+>12.3.1. <A
+HREF="#AEN2164"
 >Target Uses</A
 ></DT
 ></DL
 ></DD
 ><DT
->11.4. <A
-HREF="#AEN1975"
+>12.4. <A
+HREF="#AEN2168"
 >How Winbind Works</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.4.1. <A
-HREF="#AEN1980"
+>12.4.1. <A
+HREF="#AEN2173"
 >Microsoft Remote Procedure Calls</A
 ></DT
 ><DT
->11.4.2. <A
-HREF="#AEN1984"
+>12.4.2. <A
+HREF="#AEN2177"
 >Name Service Switch</A
 ></DT
 ><DT
->11.4.3. <A
-HREF="#AEN2000"
+>12.4.3. <A
+HREF="#AEN2193"
 >Pluggable Authentication Modules</A
 ></DT
 ><DT
->11.4.4. <A
-HREF="#AEN2008"
+>12.4.4. <A
+HREF="#AEN2201"
 >User and Group ID Allocation</A
 ></DT
 ><DT
->11.4.5. <A
-HREF="#AEN2012"
+>12.4.5. <A
+HREF="#AEN2205"
 >Result Caching</A
 ></DT
 ></DL
 ></DD
 ><DT
->11.5. <A
-HREF="#AEN2015"
+>12.5. <A
+HREF="#AEN2208"
 >Installation and Configuration</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.5.1. <A
-HREF="#AEN2022"
+>12.5.1. <A
+HREF="#AEN2212"
 >Introduction</A
 ></DT
 ><DT
->11.5.2. <A
-HREF="#AEN2035"
+>12.5.2. <A
+HREF="#AEN2225"
 >Requirements</A
 ></DT
 ><DT
->11.5.3. <A
-HREF="#AEN2049"
+>12.5.3. <A
+HREF="#AEN2241"
 >Testing Things Out</A
 ></DT
 ><DD
 ><DL
 ><DT
->11.5.3.1. <A
-HREF="#AEN2060"
->Configure and compile SAMBA</A
+>12.5.3.1. <A
+HREF="#AEN2254"
+>Configure and Compile SAMBA</A
 ></DT
 ><DT
->11.5.3.2. <A
-HREF="#AEN2079"
+>12.5.3.2. <A
+HREF="#AEN2267"
 >Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
-> and the 
+> and the
 winbind libraries</A
 ></DT
 ><DT
->11.5.3.3. <A
-HREF="#AEN2104"
->Configure smb.conf</A
+>12.5.3.3. <A
+HREF="#AEN2289"
+>Configure <TT
+CLASS="FILENAME"
+>smb.conf</TT
+></A
 ></DT
 ><DT
->11.5.3.4. <A
-HREF="#AEN2120"
+>12.5.3.4. <A
+HREF="#AEN2306"
 >Join the SAMBA server to the PDC domain</A
 ></DT
 ><DT
->11.5.3.5. <A
-HREF="#AEN2131"
+>12.5.3.5. <A
+HREF="#AEN2317"
 >Start up the winbindd daemon and test it!</A
 ></DT
 ><DT
->11.5.3.6. <A
-HREF="#AEN2167"
->Fix the <TT
-CLASS="FILENAME"
->/etc/rc.d/init.d/smb</TT
-> startup files</A
-></DT
-><DT
->11.5.3.7. <A
-HREF="#AEN2189"
+>12.5.3.6. <A
+HREF="#AEN2358"
 >Configure Winbind and PAM</A
 ></DT
 ></DL
@@ -940,52 +1021,52 @@ HREF="#AEN2189"
 ></DL
 ></DD
 ><DT
->11.6. <A
-HREF="#AEN2236"
+>12.6. <A
+HREF="#AEN2411"
 >Limitations</A
 ></DT
 ><DT
->11.7. <A
-HREF="#AEN2246"
+>12.7. <A
+HREF="#AEN2419"
 >Conclusion</A
 ></DT
 ></DL
 ></DD
 ><DT
->12. <A
+>13. <A
 HREF="#OS2"
 >OS2 Client HOWTO</A
 ></DT
 ><DD
 ><DL
 ><DT
->12.1. <A
-HREF="#AEN2260"
+>13.1. <A
+HREF="#AEN2433"
 >FAQs</A
 ></DT
 ><DD
 ><DL
 ><DT
->12.1.1. <A
-HREF="#AEN2262"
+>13.1.1. <A
+HREF="#AEN2435"
 >How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></DT
 ><DT
->12.1.2. <A
-HREF="#AEN2277"
+>13.1.2. <A
+HREF="#AEN2450"
 >How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></DT
 ><DT
->12.1.3. <A
-HREF="#AEN2286"
+>13.1.3. <A
+HREF="#AEN2459"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
->12.1.4. <A
-HREF="#AEN2290"
+>13.1.4. <A
+HREF="#AEN2463"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
@@ -994,32 +1075,32 @@ HREF="#AEN2290"
 ></DL
 ></DD
 ><DT
->13. <A
+>14. <A
 HREF="#CVS-ACCESS"
 >HOWTO Access Samba source code via CVS</A
 ></DT
 ><DD
 ><DL
 ><DT
->13.1. <A
-HREF="#AEN2306"
+>14.1. <A
+HREF="#AEN2479"
 >Introduction</A
 ></DT
 ><DT
->13.2. <A
-HREF="#AEN2311"
+>14.2. <A
+HREF="#AEN2484"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
->13.2.1. <A
-HREF="#AEN2314"
+>14.2.1. <A
+HREF="#AEN2487"
 >Access via CVSweb</A
 ></DT
 ><DT
->13.2.2. <A
-HREF="#AEN2319"
+>14.2.2. <A
+HREF="#AEN2492"
 >Access via cvs</A
 ></DT
 ></DL
@@ -1028,7 +1109,7 @@ HREF="#AEN2319"
 ></DD
 ><DT
 ><A
-HREF="#AEN2347"
+HREF="#AEN2520"
 >Index</A
 ></DT
 ></DL
@@ -1522,7 +1603,7 @@ CLASS="REPLACEABLE"
 ></TT
 ></P
 ><P
->Your should get back a list of shares available on 
+>You should get back a list of shares available on 
 	your server. If you don't then something is incorrectly setup. 
 	Note that this method can also be used to see what shares 
 	are available on other LanManager clients (such as WfWg).</P
@@ -1700,8 +1781,8 @@ NAME="AEN183"
 >By default Samba uses a blank scope ID. This means 
 		all your windows boxes must also have a blank scope ID. 
 		If you really want to use a non-blank scope ID then you will 
-		need to use the -i &#60;scope&#62; option to nmbd, smbd, and 
-		smbclient. All your PCs will need to have the same setting for 
+		need to use the 'netbios scope' smb.conf option.
+                All your PCs will need to have the same setting for 
 		this to work. I do not recommend scope IDs.</P
 ></DIV
 ><DIV
@@ -1822,19 +1903,13 @@ NAME="AEN199"
 		its open. A client may ask for DENY_NONE, DENY_READ, DENY_WRITE 
 		or DENY_ALL. There are also special compatibility modes called 
 		DENY_FCB and  DENY_DOS.</P
-><P
->You can disable share modes using "share modes = no". 
-		This may be useful on a heavily loaded server as the share 
-		modes code is very slow. See also the FAST_SHARE_MODES 
-		option in the Makefile for a way to do full share modes 
-		very fast using shared memory (if your OS supports it).</P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN209"
+NAME="AEN208"
 >1.10.6. Mapping Usernames</A
 ></H2
 ><P
@@ -1847,7 +1922,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN212"
+NAME="AEN211"
 >1.10.7. Other Character Sets</A
 ></H2
 ><P
@@ -1871,7 +1946,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN226"
+NAME="AEN225"
 >2.1. Agenda</A
 ></H1
 ><P
@@ -1938,7 +2013,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN248"
+NAME="AEN247"
 >2.2. Name Resolution in a pure Unix/Linux world</A
 ></H1
 ><P
@@ -1980,7 +2055,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN264"
+NAME="AEN263"
 >2.2.1. <TT
 CLASS="FILENAME"
 >/etc/hosts</TT
@@ -2043,7 +2118,7 @@ CLASS="FILENAME"
 > is one such file.</P
 ><P
 >When the IP address of the destination interface has been 
-determined a protocol called ARP/RARP isused to identify 
+determined a protocol called ARP/RARP is used to identify 
 the MAC address of the target interface. ARP stands for Address 
 Resolution Protocol, and is a broadcast oriented method that 
 uses UDP (User Datagram Protocol) to send a request to all 
@@ -2070,7 +2145,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN280"
+NAME="AEN279"
 >2.2.2. <TT
 CLASS="FILENAME"
 >/etc/resolv.conf</TT
@@ -2108,7 +2183,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN291"
+NAME="AEN290"
 >2.2.3. <TT
 CLASS="FILENAME"
 >/etc/host.conf</TT
@@ -2146,7 +2221,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN299"
+NAME="AEN298"
 >2.2.4. <TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
@@ -2224,7 +2299,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN311"
+NAME="AEN310"
 >2.3. Name resolution as used within MS Windows networking</A
 ></H1
 ><P
@@ -2293,7 +2368,7 @@ architecture of the MS Windows network. The term "workgroup" indicates
 that the primary nature of the network environment is that of a 
 peer-to-peer design. In a WORKGROUP all machines are responsible for 
 their own security, and generally such security is limited to use of 
-just a password (known as SHARE MORE security). In most situations 
+just a password (known as SHARE MODE security). In most situations 
 with peer-to-peer networking the users who control their own machines 
 will simply opt to have no security at all. It is possible to have 
 USER MODE security in a WORKGROUP environment, thus requiring use 
@@ -2318,13 +2393,13 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN323"
+NAME="AEN322"
 >2.3.1. The NetBIOS Name Cache</A
 ></H2
 ><P
 >All MS Windows machines employ an in memory buffer in which is 
-stored the NetBIOS names and their IP addresses for all external 
-machines that that the local machine has communicated with over the 
+stored the NetBIOS names and IP addresses for all external 
+machines that that machine has communicated with over the 
 past 10-15 minutes. It is more efficient to obtain an IP address 
 for a machine from the local cache than it is to go through all the 
 configured name resolution mechanisms.</P
@@ -2332,7 +2407,7 @@ configured name resolution mechanisms.</P
 >If a machine whose name is in the local name cache has been shut 
 down before the name had been expired and flushed from the cache, then 
 an attempt to exchange a message with that machine will be subject 
-to time-out delays. ie: It's name is in the cache, so a name resolution 
+to time-out delays. i.e.: Its name is in the cache, so a name resolution 
 lookup will succeed, but the machine can not respond. This can be 
 frustrating for users - but it is a characteristic of the protocol.</P
 ><P
@@ -2345,7 +2420,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN328"
+NAME="AEN327"
 >2.3.2. The LMHOSTS file</A
 ></H2
 ><P
@@ -2457,7 +2532,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN336"
+NAME="AEN335"
 >2.3.3. HOSTS file</A
 ></H2
 ><P
@@ -2479,7 +2554,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN341"
+NAME="AEN340"
 >2.3.4. DNS Lookup</A
 ></H2
 ><P
@@ -2499,7 +2574,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN344"
+NAME="AEN343"
 >2.3.5. WINS Lookup</A
 ></H2
 ><P
@@ -2560,13 +2635,13 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN356"
+NAME="AEN355"
 >2.4. How browsing functions and how to deploy stable and 
 dependable browsing using Samba</A
 ></H1
 ><P
 >As stated above, MS Windows machines register their NetBIOS names 
-(ie: the machine name for each service type in operation) on start 
+(i.e.: the machine name for each service type in operation) on start 
 up. Also, as stated above, the exact method by which this name registration 
 takes place is determined by whether or not the MS Windows client/server 
 has been given a WINS server address, whether or not LMHOSTS lookup 
@@ -2591,7 +2666,7 @@ Instead, the domain master browser serves the role of contacting each local
 master browser (found by asking WINS or from LMHOSTS) and exchanging browse 
 list contents. This way every master browser will eventually obtain a complete 
 list of all machines that are on the network. Every 11-15 minutes an election 
-is held to determine which machine will be the master browser. By nature of 
+is held to determine which machine will be the master browser. By the nature of 
 the election criteria used, the machine with the highest uptime, or the 
 most senior protocol version, or other criteria, will win the election 
 as domain master browser.</P
@@ -2627,7 +2702,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN366"
+NAME="AEN365"
 >2.5. MS Windows security options and how to configure 
 Samba for seemless integration</A
 ></H1
@@ -2676,8 +2751,8 @@ these versions no longer support plain text passwords by default.</P
 ><P
 >MS Windows clients have a habit of dropping network mappings that 
 have been idle for 10 minutes or longer. When the user attempts to 
-use the mapped drive connection that has been dropped the SMB protocol 
-has a mechanism by which the connection can be re-established using 
+use the mapped drive connection that has been dropped, the client
+re-establishes the connection using 
 a cached copy of the password.</P
 ><P
 >When Microsoft changed the default password mode, they dropped support for 
@@ -2769,7 +2844,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN394"
+NAME="AEN393"
 >2.5.1. Use MS Windows NT as an authentication server</A
 ></H2
 ><P
@@ -2814,7 +2889,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN402"
+NAME="AEN401"
 >2.5.2. Make Samba a member of an MS Windows NT security domain</A
 ></H2
 ><P
@@ -2886,12 +2961,12 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN419"
+NAME="AEN418"
 >2.5.3. Configure Samba as an authentication server</A
 ></H2
 ><P
 >This mode of authentication demands that there be on the 
-Unix/Linux system both a Unix style account as well as and 
+Unix/Linux system both a Unix style account as well as an 
 smbpasswd entry for the user. The Unix system account can be 
 locked if required as only the encrypted password will be 
 used for SMB client authentication.</P
@@ -2932,7 +3007,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN426"
+NAME="AEN425"
 >2.5.3.1. Users</A
 ></H3
 ><P
@@ -2964,7 +3039,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN431"
+NAME="AEN430"
 >2.5.3.2. MS Windows NT Machine Accounts</A
 ></H3
 ><P
@@ -2994,7 +3069,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN436"
+NAME="AEN435"
 >2.6. Conclusions</A
 ></H1
 ><P
@@ -3039,7 +3114,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN457"
+NAME="AEN456"
 >3.1. Samba and PAM</A
 ></H1
 ><P
@@ -3298,7 +3373,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN501"
+NAME="AEN500"
 >3.2. Distributed Authentication</A
 ></H1
 ><P
@@ -3331,7 +3406,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN508"
+NAME="AEN507"
 >3.3. PAM Configuration in smb.conf</A
 ></H1
 ><P
@@ -3379,7 +3454,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN528"
+NAME="AEN527"
 >4.1. Instructions</A
 ></H1
 ><P
@@ -3536,7 +3611,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN563"
+NAME="AEN562"
 >4.1.1. Notes</A
 ></H2
 ><P
@@ -3577,7 +3652,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN583"
+NAME="AEN582"
 >5.1. Viewing and changing UNIX permissions using the NT 
 	security dialogs</A
 ></H1
@@ -3616,7 +3691,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN592"
+NAME="AEN591"
 >5.2. How to view file security on a Samba share</A
 ></H1
 ><P
@@ -3662,7 +3737,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN603"
+NAME="AEN602"
 >5.3. Viewing file ownership</A
 ></H1
 ><P
@@ -3748,7 +3823,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN623"
+NAME="AEN622"
 >5.4. Viewing file or directory permissions</A
 ></H1
 ><P
@@ -3810,7 +3885,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN638"
+NAME="AEN637"
 >5.4.1. File Permissions</A
 ></H2
 ><P
@@ -3872,7 +3947,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN652"
+NAME="AEN651"
 >5.4.2. Directory Permissions</A
 ></H2
 ><P
@@ -3904,7 +3979,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN659"
+NAME="AEN658"
 >5.5. Modifying file or directory permissions</A
 ></H1
 ><P
@@ -4002,7 +4077,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN681"
+NAME="AEN680"
 >5.6. Interaction with the standard Samba create mask 
 	parameters</A
 ></H1
@@ -4275,7 +4350,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN745"
+NAME="AEN744"
 >5.7. Interaction with the standard Samba file attribute 
 	mapping</A
 ></H1
@@ -4330,7 +4405,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN766"
+NAME="AEN765"
 >6.1. Introduction</A
 ></H1
 ><P
@@ -4414,7 +4489,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN788"
+NAME="AEN787"
 >6.2. Configuration</A
 ></H1
 ><DIV
@@ -4466,7 +4541,7 @@ CLASS="PARAMETER"
 >printer driver
 file</I
 ></TT
-> parameter, are being depreciated and should not 
+> parameter, are being deprecated and should not
 be used in new installations.  For more information on this change, 
 you should refer to the <A
 HREF="#MIGRATION"
@@ -4482,7 +4557,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN799"
+NAME="AEN798"
 >6.2.1. Creating [print$]</A
 ></H2
 ><P
@@ -4685,7 +4760,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN834"
+NAME="AEN833"
 >6.2.2. Setting Drivers for Existing Printers</A
 ></H2
 ><P
@@ -4708,33 +4783,35 @@ properties will be displayed.  Do you want to install the
 driver now?</EM
 ></P
 ><P
->Click "No" in the error dialog and you will be presented with
-the printer properties window.  The way assign a driver to a 
+>Click <EM
+>No</EM
+> in the error dialog and you will be presented with
+the printer properties window.  The way assign a driver to a
 printer is to either</P
 ><P
 ></P
 ><UL
 ><LI
 ><P
->Use the "New Driver..." button to install 
+>Use the "New Driver..." button to install
 	a new printer driver, or</P
 ></LI
 ><LI
 ><P
->Select a driver from the popup list of 
+>Select a driver from the popup list of
 	installed drivers.  Initially this list will be empty.</P
 ></LI
 ></UL
 ><P
->If you wish to install printer drivers for client 
-operating systems other than "Windows NT x86", you will need 
+>If you wish to install printer drivers for client
+operating systems other than "Windows NT x86", you will need
 to use the "Sharing" tab of the printer properties dialog.</P
 ><P
->Assuming you have connected with a root account, you 
-will also be able modify other printer properties such as 
+>Assuming you have connected with a root account, you
+will also be able modify other printer properties such as
 ACLs and device settings using this dialog box.</P
 ><P
->A few closing comments for this section, it is possible 
+>A few closing comments for this section, it is possible
 on a Windows NT print server to have printers
 listed in the Printers folder which are not shared.  Samba does
 not make this distinction.  By definition, the only printers of
@@ -4745,7 +4822,7 @@ CLASS="FILENAME"
 >.</P
 ><P
 >Another interesting side note is that Windows NT clients do
-not use the SMB printer share, but rather can print directly 
+not use the SMB printer share, but rather can print directly
 to any printer on another Windows NT host using MS-RPC.  This
 of course assumes that the printing client has the necessary
 privileges on the remote host serving the printer.  The default
@@ -4758,22 +4835,66 @@ CLASS="SECT2"
 CLASS="SECT2"
 ><A
 NAME="AEN851"
->6.2.3. Support a large number of printers</A
+>6.2.3. DeviceModes and New Printers</A
+></H2
+><P
+>In order for a printer to be truly usbla eby a Windows NT/2k/XP client,
+it must posses:</P
+><P
+></P
+><UL
+><LI
+><P
+>a valid Device Mode generated by the driver for the printer, and</P
+></LI
+><LI
+><P
+>a complete set of PrinterDriverData generated by the driver.</P
+></LI
+></UL
+><P
+>If either one of these is incomplete, the clients can produce less than optimal 
+output at best or in the worst cases, unreadable garbage or nothing at all.  
+Fortunately, most driver generate the printer driver that is needed.
+However, the client must be tickled to generate a valid Device Mode and set it on the
+server.  The easist means of doing so is to simply set the page orientation on 
+the server's printer using the native Windows NT/2k printer properties page from 
+a Window clients.  Make sure to apply changes between swapping the page orientation
+to cause the change to actually take place.  Be aware that this can only be done
+by a "printer admin" (the reason should be obvious I hope).</P
+><P
+>Samba also includes a service level parameter name <A
+HREF="smb.conf.5.html#DEFAULTDEVMODE"
+TARGET="_top"
+>default
+devmode</A
+> for generating a default device mode for a printer.  Some driver
+will function fine with this default set of properties.  Others may crash the client's
+spooler service.  Use this parameter with caution. It is always better to have the client
+generate a valid device mode for the printer and store it on the server for you.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN862"
+>6.2.4. Support a large number of printers</A
 ></H2
 ><P
 >One issue that has arisen during the development
 phase of Samba 2.2 is the need to support driver downloads for
-100's of printers.  Using the Windows NT APW is somewhat 
-awkward to say the list.  If more than one printer are using the 
+100's of printers.  Using the Windows NT APW is somewhat
+awkward to say the list.  If more than one printer are using the
 same driver, the <A
 HREF="rpcclient.1.html"
 TARGET="_top"
 ><B
 CLASS="COMMAND"
 >rpcclient's
-setdriver command</B
+setdriver</B
 ></A
-> can be used to set the driver
+> command can be used to set the driver
 associated with an installed driver.  The following is example
 of how this could be accomplished:</P
 ><P
@@ -4785,23 +4906,22 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-> 
-<TT
+><TT
 CLASS="PROMPT"
 >$ </TT
 >rpcclient pogo -U root%secret -c "enumdrivers"
 Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
- 
+
 [Windows NT x86]
 Printer Driver Info 1:
      Driver Name: [HP LaserJet 4000 Series PS]
- 
+
 Printer Driver Info 1:
      Driver Name: [HP LaserJet 2100 Series PS]
- 
+
 Printer Driver Info 1:
      Driver Name: [HP LaserJet 4Si/4SiMX PS]
-				  
+
 <TT
 CLASS="PROMPT"
 >$ </TT
@@ -4811,7 +4931,7 @@ Domain=[NARNIA] OS=[Unix] Server=[Samba 2.2.0-alpha3]
      name:[\\POGO\hp-print]
      description:[POGO\\POGO\hp-print,NO DRIVER AVAILABLE FOR THIS PRINTER,]
      comment:[]
-				  
+
 <TT
 CLASS="PROMPT"
 >$ </TT
@@ -4832,15 +4952,15 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN862"
->6.2.4. Adding New Printers via the Windows NT APW</A
+NAME="AEN873"
+>6.2.5. Adding New Printers via the Windows NT APW</A
 ></H2
 ><P
 >By default, Samba offers all printer shares defined in <TT
 CLASS="FILENAME"
 >smb.conf</TT
 >
-in the "Printers..." folder.  Also existing in this folder is the Windows NT 
+in the "Printers..." folder.  Also existing in this folder is the Windows NT
 Add Printer Wizard icon.  The APW will be show only if</P
 ><P
 ></P
@@ -4865,7 +4985,7 @@ TARGET="_top"
 ><TT
 CLASS="PARAMETER"
 ><I
->show 
+>show
 	add printer wizard = yes</I
 ></TT
 ></A
@@ -4874,36 +4994,36 @@ CLASS="PARAMETER"
 ></LI
 ></UL
 ><P
->In order to be able to use the APW to successfully add a printer to a Samba 
+>In order to be able to use the APW to successfully add a printer to a Samba
 server, the <A
 HREF="smb.conf.5.html#ADDPRINTERCOMMAND"
 TARGET="_top"
 ><TT
 CLASS="PARAMETER"
 ><I
->add 
+>add
 printer command</I
 ></TT
 ></A
 > must have a defined value.  The program
-hook must successfully add the printer to the system (i.e. 
+hook must successfully add the printer to the system (i.e.
 <TT
 CLASS="FILENAME"
 >/etc/printcap</TT
-> or appropriate files) and 
+> or appropriate files) and
 <TT
 CLASS="FILENAME"
 >smb.conf</TT
 > if necessary.</P
 ><P
->When using the APW from a client, if the named printer share does 
+>When using the APW from a client, if the named printer share does
 not exist, <B
 CLASS="COMMAND"
 >smbd</B
 > will execute the <TT
 CLASS="PARAMETER"
 ><I
->add printer 
+>add printer
 command</I
 ></TT
 > and reparse to the <TT
@@ -4938,8 +5058,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN887"
->6.2.5. Samba and Printer Ports</A
+NAME="AEN898"
+>6.2.6. Samba and Printer Ports</A
 ></H2
 ><P
 >Windows NT/2000 print servers associate a port with each printer.  These normally
@@ -4975,7 +5095,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN895"
+NAME="AEN906"
 >6.3. The Imprints Toolset</A
 ></H1
 ><P
@@ -4988,12 +5108,19 @@ TARGET="_top"
 > as well as the documentation 
 	included with the imprints source distribution.  This section will 
 	only provide a brief introduction to the features of Imprints.</P
+><P
+>As of June 16, 2002 (quite a bit earlier actually), the Imprints
+	project is in need of a new maintainer.  The most important skill
+	is decent perl coding and an interest in MS-RPC based printing using Samba.
+	If you wich to volunteer, please coordinate your efforts on the samba-technical
+	mailing list.
+	</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN899"
+NAME="AEN911"
 >6.3.1. What is Imprints?</A
 ></H2
 ><P
@@ -5025,7 +5152,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN909"
+NAME="AEN921"
 >6.3.2. Creating Printer Driver Packages</A
 ></H2
 ><P
@@ -5041,7 +5168,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN912"
+NAME="AEN924"
 >6.3.3. The Imprints server</A
 ></H2
 ><P
@@ -5061,7 +5188,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN916"
+NAME="AEN928"
 >6.3.4. The Installation Client</A
 ></H2
 ><P
@@ -5164,7 +5291,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN938"
+NAME="AEN950"
 >6.4. <A
 NAME="MIGRATION"
 ></A
@@ -5297,6 +5424,17 @@ CLASS="PARAMETER"
 ></TR
 ></TABLE
 ></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN983"
+>6.4.1. Parameters in <TT
+CLASS="FILENAME"
+>smb.conf(5)</TT
+> for Backwards Compatibility</A
+></H2
 ><P
 >The have been two new parameters add in Samba 2.2.2 to for 
 better support of Samba 2.0.x backwards capability (<TT
@@ -5313,75 +5451,709 @@ CLASS="PARAMETER"
 ></TT
 >). Both of 
 these options are described in the smb.coinf(5) man page and are 
-disabled by default.</P
+disabled by default.  Use them with caution.</P
+></DIV
 ></DIV
 ></DIV
 ><DIV
 CLASS="CHAPTER"
 ><HR><H1
 ><A
-NAME="DOMAIN-SECURITY"
->Chapter 7. security = domain in Samba 2.x</A
+NAME="CUPS"
+>Chapter 7. Printing with CUPS in Samba 2.2.x</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN992"
->7.1. Joining an NT Domain with Samba 2.2</A
+NAME="AEN999"
+>7.1. Printing with CUPS in Samba 2.2.x</A
 ></H1
 ><P
->Assume you have a Samba 2.x server with a NetBIOS name of 
-	<TT
-CLASS="CONSTANT"
->SERV1</TT
-> and are joining an NT domain called
-	<TT
-CLASS="CONSTANT"
->DOM</TT
->, which has a PDC with a NetBIOS name
-	of <TT
-CLASS="CONSTANT"
->DOMPDC</TT
-> and two backup domain controllers 
-	with NetBIOS names <TT
-CLASS="CONSTANT"
->DOMBDC1</TT
-> and <TT
-CLASS="CONSTANT"
->DOMBDC2
-	</TT
->.</P
+><A
+HREF="http://www.cups.org/"
+TARGET="_top"
+>CUPS</A
+> is a newcomer in
+the UNIX printing scene, which has convinced many people upon first trial
+already. However, it has quite a few new features, which make it different
+from other, more traditional printing systems.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1003"
+>7.2. Configuring <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> for CUPS</A
+></H1
 ><P
->In order to join the domain, first stop all Samba daemons 
-	and run the command:</P
+>Printing with CUPS in the most basic <TT
+CLASS="FILENAME"
+>smb.conf</TT
+>
+setup in Samba 2.2.x only needs two settings: <B
+CLASS="COMMAND"
+>printing = cups</B
+> and
+<B
+CLASS="COMMAND"
+>printcap = cups</B
+>. While CUPS itself doesn't need a printcap
+anymore, the <TT
+CLASS="FILENAME"
+>cupsd.conf</TT
+> configuration file knows two directives
+(example: <B
+CLASS="COMMAND"
+>Printcap /etc/printcap</B
+> and <B
+CLASS="COMMAND"
+>PrintcapFormat
+BSD</B
+>), which control if such a file should be created for the
+convenience of third party applications. Make sure it is set! For details see
+<B
+CLASS="COMMAND"
+>man cupsd.conf</B
+> and other CUPS-related documentation.</P
 ><P
-><TT
-CLASS="PROMPT"
->root# </TT
-><TT
-CLASS="USERINPUT"
-><B
->smbpasswd -j DOM -r DOMPDC
-	-U<TT
-CLASS="REPLACEABLE"
+>If SAMBA is compiled against libcups, then <B
+CLASS="COMMAND"
+>printcap =
+cups</B
+> uses the CUPS API to list printers, submit jobs, etc. Otherwise it
+maps to the System V commands with an additional <TT
+CLASS="PARAMETER"
 ><I
->Administrator%password</I
-></TT
-></B
+>-oraw</I
 ></TT
-></P
+>
+option for printing. On a Linux system, you can use the <B
+CLASS="COMMAND"
+>ldd</B
+> command to
+find out details (ldd may not be present on other OS platforms, or its
+function may be embodied by a different command):</P
 ><P
->as we are joining the domain DOM and the PDC for that domain 
-	(the only machine that has write access to the domain SAM database) 
-	is DOMPDC. The <TT
-CLASS="REPLACEABLE"
-><I
->Administrator%password</I
-></TT
-> is 
-	the login name and password for an account which has the necessary 
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>transmeta:/home/kurt # ldd `which smbd`
+        libssl.so.0.9.6 =&#62; /usr/lib/libssl.so.0.9.6 (0x4002d000)
+        libcrypto.so.0.9.6 =&#62; /usr/lib/libcrypto.so.0.9.6 (0x4005a000)
+        libcups.so.2 =&#62; /usr/lib/libcups.so.2 (0x40123000)
+        libdl.so.2 =&#62; /lib/libdl.so.2 (0x401e8000)
+        libnsl.so.1 =&#62; /lib/libnsl.so.1 (0x401ec000)
+        libpam.so.0 =&#62; /lib/libpam.so.0 (0x40202000)
+        libc.so.6 =&#62; /lib/libc.so.6 (0x4020b000)
+        /lib/ld-linux.so.2 =&#62; /lib/ld-linux.so.2 (0x40000000)</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>The line "libcups.so.2 =&#62; /usr/lib/libcups.so.2
+(0x40123000)" shows there is CUPS support compiled into this version of
+Samba. If this is the case, and <B
+CLASS="COMMAND"
+>printing = cups</B
+> is set, then any
+otherwise manually set print command in smb.conf is ignored.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1022"
+>7.3. Using CUPS as a mere spooling print server -- "raw"
+printing with vendor drivers download</A
+></H1
+><P
+>You can setup Samba and your Windows clients to use the
+CUPS print subsystem just as you would with any of the more traditional print
+subsystems: that means the use of vendor provided, native Windows printer
+drivers for each target printer. If you setup the [print$] share to
+download these drivers to the clients, their GDI system (Graphical Device
+Interface) will output the Wndows EMF (Enhanced MetaFile) and
+convert it -- with the help of the printer driver -- locally into the format
+the printer is expecting. Samba and the CUPS print subsystem will have to
+treat these files as raw print files  -- they are already in the
+shape to be digestable for the printer. This is the same traditional setup
+for Unix print servers handling Windows client jobs. It does not take much
+CPU power to handle this kind of task efficiently.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1025"
+>7.4. CUPS as a network PostScript RIP -- CUPS drivers working on server, Adobe
+PostScript driver with CUPS-PPDs downloaded to clients</A
+></H1
+><P
+>CUPS is perfectly able to use PPD files (PostScript
+Printer Descriptions). PPDs can control all print device options. They
+are usually provided by the manufacturer -- if you own a PostSript printer,
+that is. PPD files are always a component of PostScript printer drivers on MS
+Windows or Apple Mac OS systems. They are ASCII files containing
+user-selectable print options, mapped to appropriate PostScript, PCL or PJL
+commands for the target printer. Printer driver GUI dialogs translate these
+options "on-the-fly" into buttons and drop-down lists for the user to
+select.</P
+><P
+>CUPS can load, without any conversions, the PPD file from
+any Windows (NT is recommended) PostScript driver and handle the options.
+There is a web browser interface to the print options (select
+http://localhost:631/printers/ and click on one "Configure Printer" button
+to see it), a commandline interface (see <B
+CLASS="COMMAND"
+>man lpoptions</B
+> or
+try if you have <B
+CLASS="COMMAND"
+>lphelp</B
+> on your system) plus some different GUI frontends on Linux
+UNIX, which can present PPD options to the users. PPD options are normally
+meant to become evaluated by the PostScript RIP on the real PostScript
+printer.</P
+><P
+>CUPS doesn't stop at "real" PostScript printers in its
+usage of PPDs. The CUPS developers have extended the PPD concept, to also
+describe available device and driver options for non-PostScript printers
+through  CUPS-PPDs.</P
+><P
+>This is logical, as CUPS includes a fully featured
+PostScript interpreter (RIP). This RIP is based on Ghostscript. It can
+process all received PostScript (and additionally many other file formats)
+from clients. All CUPS-PPDs geared to non-PostScript printers contain an
+additional line, starting with the keyword <TT
+CLASS="PARAMETER"
+><I
+>*cupsFilter</I
+></TT
+>.
+This line
+tells the CUPS print system which printer-specific filter to use for the
+interpretation of the accompanying PostScript. Thus CUPS lets all its
+printers appear as PostScript devices to its clients, because it can act as a
+PostScript RIP for those printers, processing the received PostScript code
+into a proper raster print format.</P
+><P
+>CUPS-PPDs can also be used on Windows-Clients, on top of a
+PostScript driver (recommended is the Adobe one).</P
+><P
+>This feature enables CUPS to do a few tricks no other
+spooler can do:</P
+><P
+></P
+><UL
+><LI
+><P
+>act as a networked PostScript RIP (Raster Image Processor), handling
+    printfiles from all client platforms in a uniform way;</P
+></LI
+><LI
+><P
+>act as a central accounting and billing server, as all files are passed
+    through the <B
+CLASS="COMMAND"
+>pstops</B
+> Filter and are therefor logged in
+    the CUPS <TT
+CLASS="FILENAME"
+>page_log</TT
+>. - <EM
+>NOTE: </EM
+>this
+    can not happen with "raw" print jobs, which always remain unfiltered
+    per definition;</P
+></LI
+><LI
+><P
+>enable clients to consolidate on a single PostScript driver, even for
+    many different target printers.</P
+></LI
+></UL
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1046"
+>7.5. Windows Terminal Servers (WTS) as CUPS clients</A
+></H1
+><P
+>This setup may be of special interest to people
+experiencing major problems in WTS environments. WTS need often a multitude
+of non-PostScript drivers installed to run their clients' variety of
+different printer models. This often imposes the price of much increased
+instability. In many cases, in an attempt to overcome this problem, site
+administrators have resorted to restrict the allowed drivers installed on
+their WTS to one generic PCL- and one PostScript driver. This however
+restricts the clients in the amount of printer options available for them --
+often they can't get out more then simplex prints from one standard paper
+tray, while their devices could do much better, if driven by a different
+driver!</P
+><P
+>Using an Adobe PostScript driver, enabled with a CUPS-PPD,
+seems to be a very elegant way to overcome all these shortcomings. The
+PostScript driver is not known to cause major stability problems on WTS (even
+if used with many different PPDs). The clients will be able to (again) chose
+paper trays, duplex printing and other settings. However, there is a certain
+price for this too: a  CUPS server acting as a PostScript RIP for its clients
+requires more CPU and RAM than just to act as  a "raw spooling" device. Plus,
+this setup is not yet widely tested, although the first feedbacks look very
+promising...</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1050"
+>7.6. Setting up CUPS for driver download</A
+></H1
+><P
+>The <B
+CLASS="COMMAND"
+>cupsadsmb</B
+> utility (shipped with all current
+CUPS versions) makes the sharing of any (or all) installed CUPS printers very
+easy. Prior to using it, you need the following settings in smb.conf:</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>[global]
+         load printers = yes
+         printing = cups
+         printcap name = cups
+
+[printers]
+         comment = All Printers
+         path = /var/spool/samba
+         browseable = no
+         public = yes
+         guest ok = yes
+         writable = no
+         printable = yes
+         printer admin = root
+
+[print$]
+         comment = Printer Drivers
+         path = /etc/samba/drivers
+         browseable = yes
+         guest ok = no
+         read only = yes
+         write list = root</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>For licensing reasons the necessary files of the Adobe
+Postscript driver can not be distributed with either Samba or CUPS. You need
+to download them yourself from the Adobe website. Once extracted, create a
+<TT
+CLASS="FILENAME"
+>drivers</TT
+> directory in the CUPS data directory (usually
+<TT
+CLASS="FILENAME"
+>/usr/share/cups/</TT
+>). Copy the Adobe files using
+UPPERCASE filenames, to this directory as follows:</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>        ADFONTS.MFM
+        ADOBEPS4.DRV
+        ADOBEPS4.HLP
+        ADOBEPS5.DLL
+        ADOBEPSU.DLL
+        ADOBEPSU.HLP
+        DEFPRTR2.PPD
+        ICONLIB.DLL</PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>Users of the ESP Print Pro software are able to install
+their "Samba Drivers" package for this purpose with no problem.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN1062"
+>7.7. Sources of CUPS drivers / PPDs</A
+></H1
+><P
+>On the internet you can find now many thousand CUPS-PPD
+files (with their companion filters), in many national languages,
+supporting more than 1.000 non-PostScript models.</P
+><P
+></P
+><UL
+><LI
+><P
+><A
+HREF="http://wwwl.easysw.com/printpro/"
+TARGET="_top"
+>ESP PrintPro
+    (http://wwwl.easysw.com/printpro/)</A
+>
+    (commercial, non-Free) is packaged with more than 3.000 PPDs, ready for
+    successful usage "out of the box" on Linux, IBM-AIX, HP-UX, Sun-Solaris,
+    SGI-IRIX, Compaq Tru64, Digital Unix and some more commercial Unices (it
+    is written by the CUPS developers themselves and its sales help finance
+    the further development of CUPS, as they feed their creators)</P
+></LI
+><LI
+><P
+>the <A
+HREF="http://gimp-print.sourceforge.net/"
+TARGET="_top"
+>Gimp-Print-Project
+    (http://gimp-print.sourceforge.net/)</A
+>
+    (GPL, Free Software) provides around 120 PPDs (supporting nearly 300
+    printers, many driven to photo quality output), to be used alongside the
+    Gimp-Print CUPS filters;</P
+></LI
+><LI
+><P
+><A
+HREF="http://www.turboprint.com/"
+TARGET="_top"
+>TurboPrint
+    (http://www.turboprint.com/)</A
+>
+    (Shareware, non-Freee) supports roughly the same amount of printers in
+    excellent quality;</P
+></LI
+><LI
+><P
+><A
+HREF="http://www-124.ibm.com/developerworks/oss/linux/projects/omni/"
+TARGET="_top"
+>OMNI
+    (http://www-124.ibm.com/developerworks/oss/linux/projects/omni/)</A
+>
+    (LPGL, Free) is a package made by IBM, now containing support for more
+    than 400 printers, stemming from the inheritance of IBM OS/2 KnowHow
+    ported over to Linux (CUPS support is in a Beta-stage at present);</P
+></LI
+><LI
+><P
+><A
+HREF="http://hpinkjet.sourceforge.net/"
+TARGET="_top"
+>HPIJS
+    (http://hpinkjet.sourceforge.net/)</A
+>
+    (BSD-style licnes, Free) supports around 120 of HP's own printers and is
+    also providing excellent print quality now;</P
+></LI
+><LI
+><P
+><A
+HREF="http://www.linuxprinting.org/"
+TARGET="_top"
+>Foomatic/cupsomatic (http://www.linuxprinting.org/)</A
+> 
+    (LPGL, Free) from Linuxprinting.org are providing PPDs for practically every
+    Ghostscript filter known to the world, now usable with CUPS.</P
+></LI
+></UL
+><P
+><EM
+>NOTE: </EM
+>the cupsomatic trick from Linuxprinting.org is
+working different from the other drivers. While the other drivers take the
+generic CUPS raster (produced by CUPS' own pstoraster PostScript RIP) as
+their input, cupsomatic "kidnaps" the PostScript inside CUPS, before
+RIP-ping, deviates it to an external Ghostscript installation (which now
+becomes the RIP) and gives it back to a CUPS backend once Ghostscript is
+finished. -- CUPS versions from 1.1.15 and later will provide their pstoraster
+PostScript RIP function again inside a system-wide Ghostscript 
+installation rather than in "their own" pstoraster filter. (This 
+CUPS-enabling Ghostscript version may be installed either as a 
+patch to GNU or AFPL Ghostscript, or as a complete ESP Ghostscript package).
+However, this will not change the cupsomatic approach of guiding the printjob
+along a different path through the filtering system than the standard CUPS
+way...</P
+><P
+>Once you installed a printer inside CUPS with one of the
+recommended methods (the lpadmin command, the web browser interface or one of
+the available GUI wizards), you can use <B
+CLASS="COMMAND"
+>cupsaddsmb</B
+> to share the
+printer via Samba. <B
+CLASS="COMMAND"
+>cupsaddsmb</B
+> prepares the driver files for
+comfortable client download and installation upon their first contact with
+this printer share.</P
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN1089"
+>7.7.1. <B
+CLASS="COMMAND"
+>cupsaddsmb</B
+></A
+></H2
+><P
+>The <B
+CLASS="COMMAND"
+>cupsaddsmb</B
+> command copies the needed files
+for convenient Windows client installations from the previously prepared CUPS
+data directory to your [print$] share. Additionally, the PPD
+associated with this printer is copied from <TT
+CLASS="FILENAME"
+>/etc/cups/ppd/</TT
+> to
+[print$].</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><TT
+CLASS="PROMPT"
+>root# </TT
+> <B
+CLASS="COMMAND"
+>cupsaddsmb -U root infotec_IS2027</B
+>
+Password for root required to access localhost via SAMBA: <TT
+CLASS="USERINPUT"
+><B
+>[type in password 'secret']</B
+></TT
+></PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>To share all printers and drivers, use the <TT
+CLASS="PARAMETER"
+><I
+>-a</I
+></TT
+>
+parameter instead of a printer name.</P
+><P
+>Probably you want to see what's going on. Use the
+<TT
+CLASS="PARAMETER"
+><I
+>-v</I
+></TT
+> parameter to get a more verbose output:</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><TT
+CLASS="PROMPT"
+>root# </TT
+> cupsaddsmb -v -U root infotec_IS2027
+    Password for root required to access localhost via SAMBA:
+    Running command: smbclient //localhost/print\$ -N -U'root%secret' -c 'mkdir W32X86;put /var/spool/cups/tmp/3cd1cc66376c0 W32X86/infotec_IS2027.PPD;put /usr/share/cups/drivers/ADOBEPS5.DLL W32X86/ADOBEPS5.DLL;put /usr/share/cups/drivers/ADOBEPSU.DLL W32X86/ADOBEPSU.DLL;put /usr/share/cups/drivers/ADOBEPSU.HLP W32X86/ADOBEPSU.HLP'
+    added interface ip=10.160.16.45 bcast=10.160.31.255 nmask=255.255.240.0
+    added interface ip=192.168.182.1 bcast=192.168.182.255 nmask=255.255.255.0
+    added interface ip=172.16.200.1 bcast=172.16.200.255 nmask=255.255.255.0
+    Domain=[TUX-NET] OS=[Unix] Server=[Samba 2.2.3a.200204262025cvs]
+    NT_STATUS_OBJECT_NAME_COLLISION making remote directory \W32X86
+    putting file /var/spool/cups/tmp/3cd1cc66376c0 as \W32X86/infotec_IS2027.PPD (17394.6 kb/s) (average 17395.2 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPS5.DLL as \W32X86/ADOBEPS5.DLL (10877.4 kb/s) (average 11343.0 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPSU.DLL as \W32X86/ADOBEPSU.DLL (5095.2 kb/s) (average 9260.4 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPSU.HLP as \W32X86/ADOBEPSU.HLP (8828.7 kb/s) (average 9247.1 kb/s)
+
+    Running command: smbclient //localhost/print\$ -N -U'root%secret' -c 'mkdir WIN40;put /var/spool/cups/tmp/3cd1cc66376c0 WIN40/infotec_IS2027.PPD;put /usr/share/cups/drivers/ADFONTS.MFM WIN40/ADFONTS.MFM;put /usr/share/cups/drivers/ADOBEPS4.DRV WIN40/ADOBEPS4.DRV;put /usr/share/cups/drivers/ADOBEPS4.HLP WIN40/ADOBEPS4.HLP;put /usr/share/cups/drivers/DEFPRTR2.PPD WIN40/DEFPRTR2.PPD;put /usr/share/cups/drivers/ICONLIB.DLL WIN40/ICONLIB.DLL;put /usr/share/cups/drivers/PSMON.DLL WIN40/PSMON.DLL;'
+    added interface ip=10.160.16.45 bcast=10.160.31.255 nmask=255.255.240.0
+    added interface ip=192.168.182.1 bcast=192.168.182.255 nmask=255.255.255.0
+    added interface ip=172.16.200.1 bcast=172.16.200.255 nmask=255.255.255.0
+    Domain=[TUX-NET] OS=[Unix] Server=[Samba 2.2.3a.200204262025cvs]
+    NT_STATUS_OBJECT_NAME_COLLISION making remote directory \WIN40
+    putting file /var/spool/cups/tmp/3cd1cc66376c0 as \WIN40/infotec_IS2027.PPD (26091.5 kb/s) (average 26092.8 kb/s)
+    putting file /usr/share/cups/drivers/ADFONTS.MFM as \WIN40/ADFONTS.MFM (11241.6 kb/s) (average 11812.9 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPS4.DRV as \WIN40/ADOBEPS4.DRV (16640.6 kb/s) (average 14679.3 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPS4.HLP as \WIN40/ADOBEPS4.HLP (11285.6 kb/s) (average 14281.5 kb/s)
+    putting file /usr/share/cups/drivers/DEFPRTR2.PPD as \WIN40/DEFPRTR2.PPD (823.5 kb/s) (average 12944.0 kb/s)
+    putting file /usr/share/cups/drivers/ICONLIB.DLL as \WIN40/ICONLIB.DLL (19226.2 kb/s) (average 13169.7 kb/s)
+    putting file /usr/share/cups/drivers/PSMON.DLL as \WIN40/PSMON.DLL (18666.1 kb/s) (average 13266.7 kb/s)
+
+    Running command: rpcclient localhost -N -U'root%secret' -c 'adddriver "Windows NT x86" "infotec_IS2027:ADOBEPS5.DLL:infotec_IS2027.PPD:ADOBEPSU.DLL:ADOBEPSU.HLP:NULL:RAW:NULL"'
+    cmd = adddriver "Windows NT x86" "infotec_IS2027:ADOBEPS5.DLL:infotec_IS2027.PPD:ADOBEPSU.DLL:ADOBEPSU.HLP:NULL:RAW:NULL"
+    Printer Driver infotec_IS2027 successfully installed.
+
+    Running command: rpcclient localhost -N -U'root%secret' -c 'adddriver "Windows 4.0" "infotec_IS2027:ADOBEPS4.DRV:infotec_IS2027.PPD:NULL:ADOBEPS4.HLP:PSMON.DLL:RAW:ADFONTS.MFM,DEFPRTR2.PPD,ICONLIB.DLL"'
+    cmd = adddriver "Windows 4.0" "infotec_IS2027:ADOBEPS4.DRV:infotec_IS2027.PPD:NULL:ADOBEPS4.HLP:PSMON.DLL:RAW:ADFONTS.MFM,DEFPRTR2.PPD,ICONLIB.DLL"
+    Printer Driver infotec_IS2027 successfully installed.
+
+    Running command: rpcclient localhost -N -U'root%secret' -c 'setdriver infotec_IS2027 infotec_IS2027'
+    cmd = setdriver infotec_IS2027 infotec_IS2027
+    Succesfully set infotec_IS2027 to driver infotec_IS2027.
+
+    <TT
+CLASS="PROMPT"
+>root# </TT
+></PRE
+></TD
+></TR
+></TABLE
+></P
+><P
+>If you look closely, you'll discover your root password
+was transfered unencrypted over the wire, so beware! Also, if you look
+further her, you'll discover error messages like
+<TT
+CLASS="CONSTANT"
+>NT_STATUS_OBJECT_NAME_COLLISION</TT
+> in between. They occur, because
+the directories <TT
+CLASS="FILENAME"
+>WIN40</TT
+> and <TT
+CLASS="FILENAME"
+>W32X86</TT
+> already
+existed in the [print$] driver download share (from a previous driver
+installation). They are harmless here.</P
+><P
+>Now your printer is prepared for the clients to use. From
+a client, browse to the CUPS/Samba server, open the "Printers"
+share, right-click on this printer and select "Install..." or
+"Connect..." (depending on the Windows version you use). Now their
+should be a new printer in your client's local "Printers" folder,
+named (in my case) "infotec_IS2027 on kdebitshop"</P
+><P
+><EM
+>NOTE: </EM
+>
+<B
+CLASS="COMMAND"
+>cupsaddsmb</B
+> will only reliably work i
+with CUPS version 1.1.15 or higher
+and Samba from 2.2.4. If it doesn't work, or if the automatic printer
+driver download to the clients doesn't succeed, you can still manually
+install the CUPS printer PPD on top of the Adobe PostScript driver on
+clients and then point the client's printer queue to the Samba printer
+share for connection, should you desire to use the CUPS networked
+PostScript RIP functions.</P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="CHAPTER"
+><HR><H1
+><A
+NAME="DOMAIN-SECURITY"
+>Chapter 8. security = domain in Samba 2.x</A
+></H1
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN1134"
+>8.1. Joining an NT Domain with Samba 2.2</A
+></H1
+><P
+>Assume you have a Samba 2.x server with a NetBIOS name of 
+	<TT
+CLASS="CONSTANT"
+>SERV1</TT
+> and are joining an NT domain called
+	<TT
+CLASS="CONSTANT"
+>DOM</TT
+>, which has a PDC with a NetBIOS name
+	of <TT
+CLASS="CONSTANT"
+>DOMPDC</TT
+> and two backup domain controllers 
+	with NetBIOS names <TT
+CLASS="CONSTANT"
+>DOMBDC1</TT
+> and <TT
+CLASS="CONSTANT"
+>DOMBDC2
+	</TT
+>.</P
+><P
+>In order to join the domain, first stop all Samba daemons 
+	and run the command:</P
+><P
+><TT
+CLASS="PROMPT"
+>root# </TT
+><TT
+CLASS="USERINPUT"
+><B
+>smbpasswd -j DOM -r DOMPDC
+	-U<TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+></B
+></TT
+></P
+><P
+>as we are joining the domain DOM and the PDC for that domain 
+	(the only machine that has write access to the domain SAM database) 
+	is DOMPDC. The <TT
+CLASS="REPLACEABLE"
+><I
+>Administrator%password</I
+></TT
+> is 
+	the login name and password for an account which has the necessary 
 	privilege to add machines to the domain.  If this is successful 
 	you will see the message:</P
 ><P
@@ -5559,8 +6331,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1056"
->7.2. Samba and Windows 2000 Domains</A
+NAME="AEN1198"
+>8.2. Samba and Windows 2000 Domains</A
 ></H1
 ><P
 >Many people have asked regarding the state of Samba's ability to participate in
@@ -5584,8 +6356,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1061"
->7.3. Why is this better than security = server?</A
+NAME="AEN1203"
+>8.3. Why is this better than security = server?</A
 ></H1
 ><P
 >Currently, domain security in Samba doesn't free you from 
@@ -5671,15 +6443,15 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="SAMBA-PDC"
->Chapter 8. How to Configure Samba 2.2 as a Primary Domain Controller</A
+>Chapter 9. How to Configure Samba 2.2 as a Primary Domain Controller</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1094"
->8.1. Prerequisite Reading</A
+NAME="AEN1236"
+>9.1. Prerequisite Reading</A
 ></H1
 ><P
 >Before you continue reading in this chapter, please make sure 
@@ -5706,8 +6478,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1100"
->8.2. Background</A
+NAME="AEN1242"
+>9.2. Background</A
 ></H1
 ><DIV
 CLASS="NOTE"
@@ -5838,8 +6610,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1139"
->8.3. Configuring the Samba Domain Controller</A
+NAME="AEN1281"
+>9.3. Configuring the Samba Domain Controller</A
 ></H1
 ><P
 >The first step in creating a working Samba PDC is to 
@@ -6059,8 +6831,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1182"
->8.4. Creating Machine Trust Accounts and Joining Clients to the
+NAME="AEN1324"
+>9.4. Creating Machine Trust Accounts and Joining Clients to the
 Domain</A
 ></H1
 ><P
@@ -6133,8 +6905,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1201"
->8.4.1. Manual Creation of Machine Trust Accounts</A
+NAME="AEN1343"
+>9.4.1. Manual Creation of Machine Trust Accounts</A
 ></H2
 ><P
 >The first step in manually creating a machine trust account is to
@@ -6300,8 +7072,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1236"
->8.4.2. "On-the-Fly" Creation of Machine Trust Accounts</A
+NAME="AEN1378"
+>9.4.2. "On-the-Fly" Creation of Machine Trust Accounts</A
 ></H2
 ><P
 >The second (and recommended) way of creating machine trust accounts is
@@ -6346,8 +7118,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1245"
->8.4.3. Joining the Client to the Domain</A
+NAME="AEN1387"
+>9.4.3. Joining the Client to the Domain</A
 ></H2
 ><P
 >The procedure for joining a client to the domain varies with the
@@ -6406,8 +7178,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1260"
->8.5. Common Problems and Errors</A
+NAME="AEN1402"
+>9.5. Common Problems and Errors</A
 ></H1
 ><P
 ></P
@@ -6605,8 +7377,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1308"
->8.6. System Policies and Profiles</A
+NAME="AEN1450"
+>9.6. System Policies and Profiles</A
 ></H1
 ><P
 >Much of the information necessary to implement System Policies and
@@ -6762,8 +7534,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1352"
->8.7. What other help can I get?</A
+NAME="AEN1494"
+>9.7. What other help can I get?</A
 ></H1
 ><P
 >There are many sources of information available in the form 
@@ -7158,8 +7930,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1466"
->8.8. Domain Control for Windows 9x/ME</A
+NAME="AEN1608"
+>9.8. Domain Control for Windows 9x/ME</A
 ></H1
 ><DIV
 CLASS="NOTE"
@@ -7272,8 +8044,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1492"
->8.8.1. Configuration Instructions:	Network Logons</A
+NAME="AEN1634"
+>9.8.1. Configuration Instructions:	Network Logons</A
 ></H2
 ><P
 >The main difference between a PDC and a Windows 9x logon 
@@ -7366,8 +8138,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1511"
->8.8.2. Configuration Instructions:	Setting up Roaming User Profiles</A
+NAME="AEN1653"
+>9.8.2. Configuration Instructions:	Setting up Roaming User Profiles</A
 ></H2
 ><DIV
 CLASS="WARNING"
@@ -7413,8 +8185,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1519"
->8.8.2.1. Windows NT Configuration</A
+NAME="AEN1661"
+>9.8.2.1. Windows NT Configuration</A
 ></H3
 ><P
 >To support WinNT clients, in the [global] section of smb.conf set the
@@ -7457,8 +8229,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1527"
->8.8.2.2. Windows 9X Configuration</A
+NAME="AEN1669"
+>9.8.2.2. Windows 9X Configuration</A
 ></H3
 ><P
 >To support Win9X clients, you must use the "logon home" parameter. Samba has
@@ -7497,8 +8269,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1535"
->8.8.2.3. Win9X and WinNT Configuration</A
+NAME="AEN1677"
+>9.8.2.3. Win9X and WinNT Configuration</A
 ></H3
 ><P
 >You can support profiles for both Win9X and WinNT clients by setting both the
@@ -7535,8 +8307,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1542"
->8.8.2.4. Windows 9X Profile Setup</A
+NAME="AEN1684"
+>9.8.2.4. Windows 9X Profile Setup</A
 ></H3
 ><P
 >When a user first logs in on Windows 9X, the file user.DAT is created,
@@ -7691,8 +8463,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1578"
->8.8.2.5. Windows NT Workstation 4.0</A
+NAME="AEN1720"
+>9.8.2.5. Windows NT Workstation 4.0</A
 ></H3
 ><P
 >When a user first logs in to a Windows NT Workstation, the profile
@@ -7773,8 +8545,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1591"
->8.8.2.6. Windows NT Server</A
+NAME="AEN1733"
+>9.8.2.6. Windows NT Server</A
 ></H3
 ><P
 >There is nothing to stop you specifying any path that you like for the
@@ -7787,8 +8559,8 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN1594"
->8.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</A
+NAME="AEN1736"
+>9.8.2.7. Sharing Profiles between W95 and NT Workstation 4.0</A
 ></H3
 ><DIV
 CLASS="WARNING"
@@ -7852,8 +8624,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1604"
->8.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
+NAME="AEN1746"
+>9.9. DOMAIN_CONTROL.txt : Windows NT Domain Control &#38; Samba</A
 ></H1
 ><DIV
 CLASS="WARNING"
@@ -7974,15 +8746,15 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="SAMBA-BDC"
->Chapter 9. How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</A
+>Chapter 10. How to Act as a Backup Domain Controller in a Purely Samba Controlled Domain</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1640"
->9.1. Prerequisite Reading</A
+NAME="AEN1782"
+>10.1. Prerequisite Reading</A
 ></H1
 ><P
 >Before you continue reading in this chapter, please make sure
@@ -7998,8 +8770,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1644"
->9.2. Background</A
+NAME="AEN1786"
+>10.2. Background</A
 ></H1
 ><P
 >What is a Domain Controller? It is a machine that is able to answer
@@ -8035,9 +8807,13 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->workgroup = SAMBA
-domain master = yes
-domain logons = yes</PRE
+>[global]
+     workgroup = SAMBA
+     domain master = yes
+     domain logons = yes
+     encrypt passwords = yes
+     security = user
+     ....</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8052,8 +8828,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1652"
->9.3. What qualifies a Domain Controller on the network?</A
+NAME="AEN1794"
+>10.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
@@ -8069,8 +8845,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1655"
->9.3.1. How does a Workstation find its domain controller?</A
+NAME="AEN1797"
+>10.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
@@ -8088,8 +8864,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1658"
->9.3.2. When is the PDC needed?</A
+NAME="AEN1800"
+>10.3.2. When is the PDC needed?</A
 ></H2
 ><P
 >Whenever a user wants to change his password, this has to be done on
@@ -8104,8 +8880,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1661"
->9.4. Can Samba be a Backup Domain Controller?</A
+NAME="AEN1803"
+>10.4. Can Samba be a Backup Domain Controller?</A
 ></H1
 ><P
 >With version 2.2, no. The native NT SAM replication protocols have
@@ -8123,8 +8899,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1665"
->9.5. How do I set up a Samba BDC?</A
+NAME="AEN1807"
+>10.5. How do I set up a Samba BDC?</A
 ></H1
 ><P
 >Several things have to be done:</P
@@ -8133,33 +8909,93 @@ NAME="AEN1665"
 ><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
+>	The file <TT
+CLASS="FILENAME"
+>private/MACHINE.SID</TT
+> 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.  Note that in the
+	latest Samba 2.2.x releases, the machine SID (and therefore domain SID) is stored
+	in the <TT
+CLASS="FILENAME"
+>private/secrets.tdb</TT
+> database.  This file cannot just
+	be copied because Samba looks under the key <TT
+CLASS="CONSTANT"
+>SECRETS/SID/<TT
+CLASS="REPLACEABLE"
+><I
+>DOMAIN</I
+></TT
+></TT
+>.
+	where <TT
+CLASS="REPLACEABLE"
+><I
+>DOMAIN</I
+></TT
+> is the machine's netbios name.  Since this name has
+	to be unique for each SAMBA server, this lookup will fail.  </P
+><P
+>	A new option has been added to the <B
+CLASS="COMMAND"
+>smbpasswd(8)</B
+>
+	command to help ease this problem.  When running <B
+CLASS="COMMAND"
+>smbpasswd -S</B
+> as the root user,
+	the domain SID will be retrieved from a domain controller matching the value of the
+	<TT
+CLASS="PARAMETER"
+><I
+>workgroup</I
+></TT
+> parameter in <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> and stored as the
+	new Samba server's machine SID.  See the <A
+HREF="smbpasswd.8.html"
+TARGET="_top"
+><B
+CLASS="COMMAND"
+>smbpasswd(8)</B
+></A
+>
+	man page for more details on this functionality.
+	</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
+>	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.  LDAP is also a
+	potential vehicle for sharing this information.
+	</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
+>	The Samba password database in the file <TT
+CLASS="FILENAME"
+>private/smbpasswd</TT
+>
+	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
+>	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
@@ -8174,9 +9010,13 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->workgroup = samba
-domain master = no
-domain logons = yes</PRE
+>[global]
+     workgroup = SAMBA
+     domain master = yes
+     domain logons = yes
+     encrypt passwords = yes
+     security = user
+     ....</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8193,21 +9033,57 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1681"
->9.5.1. How do I replicate the smbpasswd file?</A
+NAME="AEN1836"
+>10.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
+whenever changes to the SAM are made. Every user's password change
+(including machine trust account password changes) 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
+<B
+CLASS="COMMAND"
+>rsync(1)</B
+>. <B
+CLASS="COMMAND"
+>rsync</B
+> can use
+<B
+CLASS="COMMAND"
+>ssh(1)</B
+> as a transport. <B
+CLASS="COMMAND"
+>ssh</B
+> itself
+can be set up to accept <EM
+>only</EM
+> <B
+CLASS="COMMAND"
+>rsync</B
+> transfer without requiring the user to
+type a password.  Refer to the man pages for these two tools for more details.</P
+><P
+>Another solution with high potential is to use Samba's <TT
+CLASS="PARAMETER"
+><I
+>--with-ldapsam</I
+></TT
+>
+for sharing and/or replicating the list of <TT
+CLASS="CONSTANT"
+>sambaAccount</TT
+> entries.
+This can all be done over SSL to ensure security.  See the <A
+HREF="Samba-LDAP-HOWTO.html"
+TARGET="_top"
+>Samba-LDAP-HOWTO</A
+>
+for more details.</P
 ></DIV
 ></DIV
 ></DIV
@@ -8216,15 +9092,15 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="SAMBA-LDAP-HOWTO"
->Chapter 10. Storing Samba's User/Machine Account information in an LDAP Directory</A
+>Chapter 11. Storing Samba's User/Machine Account information in an LDAP Directory</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1702"
->10.1. Purpose</A
+NAME="AEN1867"
+>11.1. Purpose</A
 ></H1
 ><P
 >This document describes how to use an LDAP directory for storing Samba user
@@ -8259,7 +9135,7 @@ TARGET="_top"
 >O'Reilly Publishing</A
 > is working on
 a guide to LDAP for System Administrators which has a planned release date of
-early summer, 2002.</P
+late 2002.</P
 ><P
 >Two additional Samba resources which may prove to be helpful are</P
 ><P
@@ -8281,7 +9157,11 @@ 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.
+	geared to manage users and group in such a Samba-LDAP Domain Controller configuration.  These scripts can
+	be found in the Samba 2.2.5 release in the <TT
+CLASS="FILENAME"
+>examples/LDAP/smbldap-tools/</TT
+> directory.
 	</P
 ></LI
 ></UL
@@ -8291,8 +9171,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1722"
->10.2. Introduction</A
+NAME="AEN1888"
+>11.2. Introduction</A
 ></H1
 ><P
 >Traditionally, when configuring <A
@@ -8319,7 +9199,7 @@ in the thousands).</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 a performance bottleneck for lareg sites.  What is needed is an indexed approach
+is a performance bottleneck for large sites.  What is needed is an indexed approach
 such as is used in databases.</P
 ></LI
 ><LI
@@ -8345,7 +9225,10 @@ Identified (RID).</P
 ></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
+used by <B
+CLASS="COMMAND"
+>smbd</B
+> 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
 for a samdb backend (e.g. <TT
@@ -8367,7 +9250,10 @@ CLASS="PARAMETER"
 >--with-ldapsam</I
 ></TT
 > autoconf
-option, smbd (and associated tools) will store and lookup user accounts in
+option, <B
+CLASS="COMMAND"
+>smbd</B
+> (and associated tools) will store and lookup user accounts in
 an LDAP directory.  In reality, this is very easy to understand.  If you are
 comfortable with using an smbpasswd file, simply replace "smbpasswd" with
 "LDAP directory" in all the documentation.</P
@@ -8408,8 +9294,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1751"
->10.3. Supported LDAP Servers</A
+NAME="AEN1919"
+>11.3. Supported LDAP Servers</A
 ></H1
 ><P
 >The LDAP samdb code in 2.2.3 has been developed and tested using the OpenLDAP
@@ -8433,8 +9319,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1756"
->10.4. Schema and Relationship to the RFC 2307 posixAccount</A
+NAME="AEN1924"
+>11.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
@@ -8453,7 +9339,7 @@ WIDTH="100%"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->objectclass ( 1.3.1.5.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL
+>objectclass ( 1.3.1.5.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILARY
      DESC 'Samba Account'
      MUST ( uid $ rid )
      MAY  ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
@@ -8465,7 +9351,10 @@ CLASS="PROGRAMLISTING"
 ></TABLE
 ></P
 ><P
->The samba.schema file has been formatted for OpenLDAP 2.0.  The OID's are
+>The <TT
+CLASS="FILENAME"
+>samba.schema</TT
+> file has been formatted for OpenLDAP 2.0 &#38; 2.1.  The OID's are
 owned by the Samba Team and as such is legal to be openly published.
 If you translate the schema to be used with Netscape DS, please
 submit the modified schema file as a patch to <A
@@ -8474,22 +9363,47 @@ TARGET="_top"
 >jerry@samba.org</A
 ></P
 ><P
+>Since the original release, schema files for</P
+><P
+></P
+><UL
+><LI
+><P
+>IBM's SecureWay Server</P
+></LI
+><LI
+><P
+>Netscape Directory Server version 4.x and 5.x</P
+></LI
+></UL
+><P
+>have been submitted and included in the Samba source distribution.  I cannot
+personally comment on the integration of these commercial directory servers since
+I have not had the oppotinuity to work with them.</P
+><P
 >Just as the smbpasswd file is mean to store information which supplements a
 user's <TT
 CLASS="FILENAME"
 >/etc/passwd</TT
 > entry, so is the sambaAccount object
-meant to supplement the UNIX user account information.  A sambaAccount is a
+meant to supplement the UNIX user account information.  A sambaAccount is now an
 <TT
 CLASS="CONSTANT"
->STRUCTURAL</TT
-> objectclass so it can be stored individually
-in the directory.  However, there are several fields (e.g. uid) which overlap
-with the posixAccount objectclass outlined in RFC2307.  This is by design.</P
+>AUXILARY</TT
+> objectclass so it can be stored alongside
+a posixAccount or person objectclass in the directory.  Note that there are
+several fields (e.g. uid) which overlap with the posixAccount objectclass
+outlined in RFC2307.  This is by design.  The move from a STRUCTURAL objectclass
+to an AUXILIARY one was compliance with the LDAP data model which states that
+an entry can contain only one STRUCTURAL objectclass per entry.  This is now
+enforced by the OpenLDAP 2.1 server.</P
 ><P
 >In order to store all user account information (UNIX and Samba) in the directory,
 it is necessary to use the sambaAccount and posixAccount objectclasses in
-combination.  However, smbd will still obtain the user's UNIX account
+combination.  However, <B
+CLASS="COMMAND"
+>smbd</B
+> will still obtain the user's UNIX account
 information via the standard C library calls (e.g. getpwnam(), et. al.).
 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
@@ -8501,16 +9415,16 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1768"
->10.5. Configuring Samba with LDAP</A
+NAME="AEN1945"
+>11.5. Configuring Samba with LDAP</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1770"
->10.5.1. OpenLDAP configuration</A
+NAME="AEN1947"
+>11.5.1. OpenLDAP configuration</A
 ></H2
 ><P
 >To include support for the sambaAccount object in an OpenLDAP directory
@@ -8588,9 +9502,9 @@ CLASS="PROGRAMLISTING"
 ## required by OpenLDAP 2.0
 index objectclass   eq
 
-## support pb_getsampwnam()
+## support pbb_getsampwnam()
 index uid           pres,eq
-## support pdb_getsambapwrid()
+## support pdb_getsampwrid()
 index rid           eq
 
 ## uncomment these if you are storing posixAccount and
@@ -8609,8 +9523,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1787"
->10.5.2. Configuring Samba</A
+NAME="AEN1964"
+>11.5.2. Configuring Samba</A
 ></H2
 ><P
 >The following parameters are available in smb.conf only with <TT
@@ -8732,14 +9646,70 @@ CLASS="REPLACEABLE"
 ></TABLE
 ></P
 ></DIV
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN1992"
+>11.5.3. Importing <TT
+CLASS="FILENAME"
+>smbpasswd</TT
+> entries</A
+></H2
+><P
+>Import existing user entries from an <TT
+CLASS="FILENAME"
+>smbpasswd</TT
+> can be trivially done using
+a Perl script named <TT
+CLASS="FILENAME"
+>import_smbpasswd.pl</TT
+> included in the
+<TT
+CLASS="FILENAME"
+>examples/LDAP/</TT
+> directory of the Samba source distribution.  There are
+two main requirements of this script:</P
+><P
+></P
+><UL
+><LI
+><P
+>All users to be imported to the directory must have a valid uid on the
+	local system.  This can be a problem if using a machinej different from the Samba server
+	to import the file.</P
+></LI
+><LI
+><P
+>The local system must have a working installation of the Net::LDAP perl
+	module which can be obtained from with <A
+HREF="http://search.cpan.org/"
+TARGET="_top"
+>http://search.cpan.org/</A
+>
+	by searching for <TT
+CLASS="FILENAME"
+>perl-ldap</TT
+> or directly from <A
+HREF="http://perl-ldap.sf.net/"
+TARGET="_top"
+>http://perl-ldap.sf.net/</A
+>.
+	</P
+></LI
+></UL
+><P
+>Please refer to the documentation in the same directory as the script for more details.</P
+></DIV
 ></DIV
 ><DIV
 CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1815"
->10.6. Accounts and Groups management</A
+NAME="AEN2008"
+>11.6. Accounts and Groups management</A
 ></H1
 ><P
 >As users accounts are managed thru the sambaAccount objectclass, you should
@@ -8763,8 +9733,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1820"
->10.7. Security and sambaAccount</A
+NAME="AEN2013"
+>11.7. Security and sambaAccount</A
 ></H1
 ><P
 >There are two important points to remember when discussing the security
@@ -8843,8 +9813,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1840"
->10.8. LDAP specials attributes for sambaAccounts</A
+NAME="AEN2033"
+>11.8. LDAP specials attributes for sambaAccounts</A
 ></H1
 ><P
 >The sambaAccount objectclass is composed of the following attributes:</P
@@ -9054,8 +10024,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1910"
->10.9. Example LDIF Entries for a sambaAccount</A
+NAME="AEN2103"
+>11.9. Example LDIF Entries for a sambaAccount</A
 ></H1
 ><P
 >The following is a working LDIF with the inclusion of the posixAccount objectclass:</P
@@ -9130,8 +10100,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1918"
->10.10. Comments</A
+NAME="AEN2111"
+>11.10. Comments</A
 ></H1
 ><P
 >Please mail all comments regarding this HOWTO to <A
@@ -9139,7 +10109,7 @@ HREF="mailto:jerry@samba.org"
 TARGET="_top"
 >jerry@samba.org</A
 >.  This documents was
-last updated to reflect the Samba 2.2.3 release.&#13;</P
+last updated to reflect the Samba 2.2.5 release.&#13;</P
 ></DIV
 ></DIV
 ><DIV
@@ -9147,15 +10117,15 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="WINBIND"
->Chapter 11. Unified Logons between Windows NT and UNIX using Winbind</A
+>Chapter 12. Unified Logons between Windows NT and UNIX using Winbind</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1947"
->11.1. Abstract</A
+NAME="AEN2140"
+>12.1. Abstract</A
 ></H1
 ><P
 >Integration of UNIX and Microsoft Windows NT through 
@@ -9177,8 +10147,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1951"
->11.2. Introduction</A
+NAME="AEN2144"
+>12.2. Introduction</A
 ></H1
 ><P
 >It is well known that UNIX and Microsoft Windows NT have 
@@ -9231,8 +10201,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1964"
->11.3. What Winbind Provides</A
+NAME="AEN2157"
+>12.3. What Winbind Provides</A
 ></H1
 ><P
 >Winbind unifies UNIX and Windows NT account management by 
@@ -9273,8 +10243,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1971"
->11.3.1. Target Uses</A
+NAME="AEN2164"
+>12.3.1. Target Uses</A
 ></H2
 ><P
 >Winbind is targeted at organizations that have an 
@@ -9286,7 +10256,7 @@ NAME="AEN1971"
 		workstations into a NT based organization.</P
 ><P
 >Another interesting way in which we expect Winbind to 
-		be used is as a central part of UNIX based appliances. Appliances 
+		be used is as a central part of UNIX based appliances. Appliances
 		that provide file and print services to Microsoft based networks 
 		will be able to use Winbind to provide seamless integration of 
 		the appliance into the domain.</P
@@ -9297,8 +10267,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN1975"
->11.4. How Winbind Works</A
+NAME="AEN2168"
+>12.4. How Winbind Works</A
 ></H1
 ><P
 >The winbind system is designed around a client/server 
@@ -9317,8 +10287,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1980"
->11.4.1. Microsoft Remote Procedure Calls</A
+NAME="AEN2173"
+>12.4.1. Microsoft Remote Procedure Calls</A
 ></H2
 ><P
 >Over the last two years, efforts have been underway 
@@ -9343,8 +10313,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN1984"
->11.4.2. Name Service Switch</A
+NAME="AEN2177"
+>12.4.2. Name Service Switch</A
 ></H2
 ><P
 >The Name Service Switch, or NSS, is a feature that is 
@@ -9423,8 +10393,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2000"
->11.4.3. Pluggable Authentication Modules</A
+NAME="AEN2193"
+>12.4.3. Pluggable Authentication Modules</A
 ></H2
 ><P
 >Pluggable Authentication Modules, also known as PAM, 
@@ -9472,8 +10442,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2008"
->11.4.4. User and Group ID Allocation</A
+NAME="AEN2201"
+>12.4.4. User and Group ID Allocation</A
 ></H2
 ><P
 >When a user or group is created under Windows NT 
@@ -9498,8 +10468,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2012"
->11.4.5. Result Caching</A
+NAME="AEN2205"
+>12.4.5. Result Caching</A
 ></H2
 ><P
 >An active system can generate a lot of user and group 
@@ -9521,8 +10491,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2015"
->11.5. Installation and Configuration</A
+NAME="AEN2208"
+>12.5. Installation and Configuration</A
 ></H1
 ><P
 >Many thanks to John Trostel <A
@@ -9530,37 +10500,29 @@ HREF="mailto:jtrostel@snapserver.com"
 TARGET="_top"
 >jtrostel@snapserver.com</A
 >
-for providing the HOWTO for this section.</P
-><P
->This HOWTO describes how to get winbind services up and running 
+for providing the original Linux version of this HOWTO which 
+describes how to get winbind services up and running 
 to control access and authenticate users on your Linux box using 
-the winbind services which come with SAMBA 2.2.2.</P
-><P
->There is also some Solaris specific information in 
-<TT
-CLASS="FILENAME"
->docs/textdocs/Solaris-Winbind-HOWTO.txt</TT
->.
-Future revisions of this document will incorporate that
-information.</P
+the winbind services which are included with the SAMBA 2.2.2 and later
+releases.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2022"
->11.5.1. Introduction</A
+NAME="AEN2212"
+>12.5.1. Introduction</A
 ></H2
 ><P
 >This HOWTO describes the procedures used to get winbind up and 
-running on my RedHat 7.1 system.  Winbind is capable of providing access 
-and authentication control for Windows Domain users through an NT 
-or Win2K PDC for 'regular' services, such as telnet a nd ftp, as
-well for SAMBA services.</P
+running on a RedHat 7.1 system.  Winbind is capable of providing access
+and authentication control for Windows Domain users through an NT
+or Win2K PDC for 'regular' services, such as telnet and ftp, as
+well providing dynamic uid/gid allocation for Samba.</P
 ><P
->This HOWTO has been written from a 'RedHat-centric' perspective, so if 
-you are using another distribution, you may have to modify the instructions 
-somewhat to fit the way your distribution works.</P
+>This HOWTO has been written from a 'RedHat-centric' perspective, so if
+you are using another distribution (or operating system), you may have
+to modify the instructions somewhat to fit the way your distribution works.</P
 ><P
 ></P
 ><UL
@@ -9571,9 +10533,9 @@ somewhat to fit the way your distribution works.</P
 >
 	</P
 ><P
->This allows the SAMBA administrator to rely on the 
-	authentication mechanisms on the NT/Win2K PDC for the authentication 
-	of domain members.  NT/Win2K users no longer need to have separate 
+>This allows the SAMBA administrator to rely on the
+	authentication mechanisms on the NT/Win2K PDC for the authentication
+	of domain members.  NT/Win2K users no longer need to have separate
 	accounts on the SAMBA server.
 	</P
 ></LI
@@ -9584,12 +10546,10 @@ somewhat to fit the way your distribution works.</P
 >
 	</P
 ><P
->	This HOWTO is designed for system administrators.  If you are 
-	implementing SAMBA on a file server and wish to (fairly easily) 
+>	This HOWTO is designed for system administrators.  If you are
+	implementing SAMBA on a file server and wish to (fairly easily)
 	integrate existing NT/Win2K users from your PDC onto the
-	SAMBA server, this HOWTO is for you.  That said, I am no NT or PAM 
-	expert, so you may find a better or easier way to accomplish 
-	these tasks.
+	SAMBA server, this HOWTO is for you.
 	</P
 ></LI
 ></UL
@@ -9599,116 +10559,127 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2035"
->11.5.2. Requirements</A
+NAME="AEN2225"
+>12.5.2. Requirements</A
 ></H2
 ><P
->If you have a samba configuration file that you are currently 
+>If you have a samba configuration file that you are currently
 using... <EM
 >BACK IT UP!</EM
->  If your system already uses PAM, 
+>  If your system already uses PAM,
 <EM
 >back up the <TT
 CLASS="FILENAME"
 >/etc/pam.d</TT
-> directory 
-contents!</EM
-> If you haven't already made a boot disk, 
+> (or <TT
+CLASS="FILENAME"
+>/etc/pam.conf</TT
+>)
+directory contents!</EM
+> If you haven't already made a boot disk,
 <EM
 >MAKE ONE NOW!</EM
 ></P
 ><P
->Messing with the pam configuration files can make it nearly impossible 
-to log in to yourmachine. That's why you want to be able to boot back 
-into your machine in single user mode and restore your 
+>Messing with the pam configuration files can make it nearly impossible
+to log in to your machine. That's why you want to be able to boot back
+into your machine in single user mode and restore your
 <TT
 CLASS="FILENAME"
 >/etc/pam.d</TT
-> back to the original state they were in if 
-you get frustrated with the way things are going.  ;-)</P
+> (or <TT
+CLASS="FILENAME"
+>pam.conmf</TT
+>) back to
+the original state they were in if
+you get frustrated with the way things are going.</P
 ><P
->The latest version of SAMBA (version 2.2.2 as of this writing), now 
-includes a functioning winbindd daemon.  Please refer to the 
+>The first SAMBA release to inclue a stable winbindd daemon was 2.2.2.  Please refer to the
 <A
 HREF="http://samba.org/"
 TARGET="_top"
 >main SAMBA web page</A
-> or, 
-better yet, your closest SAMBA mirror site for instructions on 
-downloading the source code.</P
+> or,
+better yet, your closest SAMBA mirror site for instructions on
+downloading the source code.  it is generally advised to obtain the lates
+Samba release as bugs are constantly being fixed.</P
 ><P
->To allow Domain users the ability to access SAMBA shares and 
-files, as well as potentially other services provided by your 
+>To allow Domain users the ability to access SAMBA shares and
+files, as well as potentially other services provided by your
 SAMBA machine, PAM (pluggable authentication modules) must
-be setup properly on your machine.  In order to compile the 
-winbind modules, you should have at least the pam libraries resident 
-on your system.  For recent RedHat systems (7.1, for instance), that 
-means <TT
+be setup properly on your machine.  In order to compile the
+winbind modules, you must have at the PAM libraries and header files resident
+on your system.  For recent RedHat systems (7.x, for instance), that
+means installing both <TT
 CLASS="FILENAME"
->pam-0.74-22</TT
->.  For best results, it is helpful to also
-install the development packages in <TT
+>pam</TT
+> and <TT
 CLASS="FILENAME"
->pam-devel-0.74-22</TT
->.</P
+>pam-devel</TT
+> RPM.
+The former is installed by default on all Linux systems of which the author is aware.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2049"
->11.5.3. Testing Things Out</A
+NAME="AEN2241"
+>12.5.3. Testing Things Out</A
 ></H2
 ><P
->Before starting, it is probably best to kill off all the SAMBA 
-related daemons running on your server.  Kill off all <B
+>Before starting, kill off all the SAMBA related daemons running on your server.  Kill off
+all <B
 CLASS="COMMAND"
 >smbd</B
->, 
-<B
+>, <B
 CLASS="COMMAND"
 >nmbd</B
 >, and <B
 CLASS="COMMAND"
 >winbindd</B
-> processes that may 
-be running.  To use PAM, you will want to make sure that you have the 
-standard PAM package (for RedHat) which supplies the <TT
+> processes that may
+be running (<B
+CLASS="COMMAND"
+>winbindd</B
+> will only be running if you have ao previous Winbind
+installation...but why would you be reading tis if that were the case?).  To use PAM, you will
+want to make sure that you have the standard PAM package (for RedHat) which supplies the <TT
 CLASS="FILENAME"
 >/etc/pam.d</TT
-> 
-directory structure, including the pam modules are used by pam-aware 
+>
+directory structure, including the pam modules are used by pam-aware
 services, several pam libraries, and the <TT
 CLASS="FILENAME"
 >/usr/doc</TT
-> 
+>
 and <TT
 CLASS="FILENAME"
 >/usr/man</TT
-> entries for pam.  Winbind built better 
-in SAMBA if the pam-devel package was also installed.  This package includes 
-the header files needed to compile pam-aware applications. For instance, 
-my RedHat system has both <TT
-CLASS="FILENAME"
->pam-0.74-22</TT
-> and
-<TT
+> entries for pam.  Samba will require
+the pam-devel package if you plan to build the <TT
 CLASS="FILENAME"
->pam-devel-0.74-22</TT
-> RPMs installed.</P
+>pam_winbind.so</TT
+> library or
+include the <B
+CLASS="COMMAND"
+>--with-pam</B
+> option to the configure script.
+This package includes the header files needed to compile pam-aware applications.</P
+><P
+>[I have no idea which Solaris packages are quired for PAM libraries and
+development files.  If you know, please mail me the information and I will include
+it in the next revision of this HOWTO.  --jerry@samba.org]</P
 ><DIV
 CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2060"
->11.5.3.1. Configure and compile SAMBA</A
+NAME="AEN2254"
+>12.5.3.1. Configure and Compile SAMBA</A
 ></H3
 ><P
->The configuration and compilation of SAMBA is pretty straightforward.
-The first three steps may not be necessary depending upon
-whether or not you have previously built the Samba binaries.</P
+>The configuration and compilation of SAMBA is straightforward.</P
 ><P
 ><TABLE
 BORDER="0"
@@ -9723,27 +10694,6 @@ CLASS="PROMPT"
 >root#</TT
 > <B
 CLASS="COMMAND"
->autoconf</B
->
-<TT
-CLASS="PROMPT"
->root#</TT
-> <B
-CLASS="COMMAND"
->make clean</B
->
-<TT
-CLASS="PROMPT"
->root#</TT
-> <B
-CLASS="COMMAND"
->rm config.cache</B
->
-<TT
-CLASS="PROMPT"
->root#</TT
-> <B
-CLASS="COMMAND"
 >./configure --with-winbind</B
 >
 <TT
@@ -9770,36 +10720,43 @@ CLASS="FILENAME"
 >/usr/local/samba</TT
 >.
 See the main SAMBA documentation if you want to install SAMBA somewhere else.
-It will also build the winbindd executable and libraries. </P
+It will also build the winbindd executable and NSS library.</P
 ></DIV
 ><DIV
 CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2079"
->11.5.3.2. Configure <TT
+NAME="AEN2267"
+>12.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
-> and the 
+> and the
 winbind libraries</A
 ></H3
 ><P
 >The libraries needed to run the <B
 CLASS="COMMAND"
 >winbindd</B
-> daemon 
-through nsswitch need to be copied to their proper locations, so</P
+> daemon
+through nsswitch need to be copied to their proper locations.</P
 ><P
 ><TT
 CLASS="PROMPT"
 >root#</TT
 > <B
 CLASS="COMMAND"
->cp ../samba/source/nsswitch/libnss_winbind.so /lib</B
+>cp nsswitch/libnss_winbind.so /lib</B
+>
+<TT
+CLASS="PROMPT"
+>root#</TT
+> <B
+CLASS="COMMAND"
+>chmod 755 /lib/libnss_winbind.so</B
 ></P
 ><P
->I also found it necessary to make the following symbolic link:</P
+>It necessary to make the following symbolic link:</P
 ><P
 ><TT
 CLASS="PROMPT"
@@ -9809,19 +10766,26 @@ CLASS="COMMAND"
 >ln -s /lib/libnss_winbind.so /lib/libnss_winbind.so.2</B
 ></P
 ><P
->Now, as root you need to edit <TT
+>The <TT
+CLASS="FILENAME"
+>.2</TT
+> extension is due to the version of glibc used on your Linux host.
+for most modern systems, the file extension is correct.  However, some other operating systems,
+Solaris 7/8 being the most common, the destination filename should be replaced with
+<TT
+CLASS="FILENAME"
+>/lib/nss_winbind.so.1</TT
+></P
+><P
+>Now, as root edit <TT
 CLASS="FILENAME"
 >/etc/nsswitch.conf</TT
-> to 
+> to
 allow user and group entries to be visible from the <B
 CLASS="COMMAND"
 >winbindd</B
-> 
-daemon.  My <TT
-CLASS="FILENAME"
->/etc/nsswitch.conf</TT
-> file look like 
-this after editing:</P
+>
+daemon.  After editing, the file look appear:</P
 ><P
 ><TABLE
 BORDER="0"
@@ -9832,59 +10796,39 @@ WIDTH="100%"
 ><PRE
 CLASS="PROGRAMLISTING"
 >	passwd:     files winbind
-	shadow:     files 
+	shadow:     files
 	group:      files winbind</PRE
 ></TD
 ></TR
 ></TABLE
 ></P
-><P
->	
-The libraries needed by the winbind daemon will be automatically 
-entered into the <B
-CLASS="COMMAND"
->ldconfig</B
-> cache the next time 
-your system reboots, but it 
-is faster (and you don't need to reboot) if you do it manually:</P
-><P
-><TT
-CLASS="PROMPT"
->root#</TT
-> <B
-CLASS="COMMAND"
->/sbin/ldconfig -v | grep winbind</B
-></P
-><P
->This makes <TT
-CLASS="FILENAME"
->libnss_winbind</TT
-> available to winbindd 
-and echos back a check to you.</P
 ></DIV
 ><DIV
 CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2104"
->11.5.3.3. Configure smb.conf</A
+NAME="AEN2289"
+>12.5.3.3. Configure <TT
+CLASS="FILENAME"
+>smb.conf</TT
+></A
 ></H3
 ><P
->Several parameters are needed in the smb.conf file to control 
+>Several parameters are needed in the smb.conf file to control
 the behavior of <B
 CLASS="COMMAND"
 >winbindd</B
->. Configure 
+>. Configure
 <TT
 CLASS="FILENAME"
 >smb.conf</TT
-> These are described in more detail in 
+> These are described in more detail in
 the <A
 HREF="winbindd.8.html"
 TARGET="_top"
 >winbindd(8)</A
-> man page.  My 
+> man page.  My
 <TT
 CLASS="FILENAME"
 >smb.conf</TT
@@ -9920,6 +10864,8 @@ TARGET="_top"
 >winbind gid</A
 > = 10000-20000
      # allow enumeration of winbind users and groups
+     # might need to disable these next two for performance
+     # reasons on the winbindd host
      <A
 HREF="winbindd.8.html#WINBINDENUMUSERS"
 TARGET="_top"
@@ -9930,7 +10876,7 @@ HREF="winbindd.8.html#WINBINDENUMGROUP"
 TARGET="_top"
 >winbind enum groups</A
 > = yes
-     # give winbind users a real shell (only needed if they have telnet access)
+     # give winbind users a real shell (only needed if they have telnet/sshd/etc... access)
      <A
 HREF="winbindd.8.html#TEMPLATEHOMEDIR"
 TARGET="_top"
@@ -9951,23 +10897,23 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2120"
->11.5.3.4. Join the SAMBA server to the PDC domain</A
+NAME="AEN2306"
+>12.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 
+>Enter the following command to make the SAMBA server join the
 PDC domain, where <TT
 CLASS="REPLACEABLE"
 ><I
 >DOMAIN</I
 ></TT
-> is the name of 
+> is the name of
 your Windows domain and <TT
 CLASS="REPLACEABLE"
 ><I
 >Administrator</I
 ></TT
-> is 
+> is
 a domain user who has administrative privileges in the domain.</P
 ><P
 ><TT
@@ -9978,7 +10924,7 @@ CLASS="COMMAND"
 >/usr/local/samba/bin/smbpasswd -j DOMAIN -r PDC -U Administrator</B
 ></P
 ><P
->The proper response to the command should be: "Joined the domain 
+>The proper response to the command should be: "Joined the domain
 <TT
 CLASS="REPLACEABLE"
 ><I
@@ -9989,7 +10935,7 @@ CLASS="REPLACEABLE"
 ><I
 >DOMAIN</I
 ></TT
-> 
+>
 is your DOMAIN name.</P
 ></DIV
 ><DIV
@@ -9997,14 +10943,14 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2131"
->11.5.3.5. Start up the winbindd daemon and test it!</A
+NAME="AEN2317"
+>12.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 
-automatically invoke the winbindd daemon when the other parts of 
+>Eventually, you will want to modify your smb startup script to
+automatically invoke the winbindd daemon when the other parts of
 SAMBA start, but it is possible to test out just the winbind
-portion first.  To start up winbind services, enter the following 
+portion first.  To start up winbind services, enter the following
 command as root:</P
 ><P
 ><TT
@@ -10012,10 +10958,17 @@ CLASS="PROMPT"
 >root#</TT
 > <B
 CLASS="COMMAND"
->/usr/local/samba/bin/winbindd</B
+>export PATH=$PATH:/usr/local/samba/bin</B
+>
+<TT
+CLASS="PROMPT"
+>root#</TT
+> <B
+CLASS="COMMAND"
+>winbindd</B
 ></P
 ><P
->I'm always paranoid and like to make sure the daemon 
+>I'm always paranoid and like to make sure the daemon
 is really running...</P
 ><P
 ><TT
@@ -10030,7 +10983,13 @@ CLASS="COMMAND"
 ><P
 >3025 ?        00:00:00 winbindd</P
 ><P
->Now... for the real test, try to get some information about the 
+>Note that a sample RedHat init script for starting winbindd is included in
+the SAMBA sourse distribution as <TT
+CLASS="FILENAME"
+>packaging/RedHat/winbind.init</TT
+>.</P
+><P
+>Now... for the real test, try to get some information about the
 users on your PDC</P
 ><P
 ><TT
@@ -10038,11 +10997,10 @@ CLASS="PROMPT"
 >root#</TT
 > <B
 CLASS="COMMAND"
->/usr/local/samba/bin/wbinfo -u</B
+>wbinfo -u</B
 ></P
 ><P
->	
-This should echo back a list of users on your Windows users on 
+>This should echo back a list of users on your Windows users on
 your PDC.  For example, I get the following response:</P
 ><P
 ><TABLE
@@ -10072,7 +11030,7 @@ separator</I
 ></TT
 > is '+'.</P
 ><P
->You can do the same sort of thing to get group information from 
+>You can do the same sort of thing to get group information from
 the PDC:</P
 ><P
 ><TABLE
@@ -10104,7 +11062,7 @@ CEO+Group Policy Creator Owners</PRE
 ></TABLE
 ></P
 ><P
->The function 'getent' can now be used to get unified 
+>The function 'getent' can now be used to get unified
 lists of both local and PDC users and groups.
 Try the following command:</P
 ><P
@@ -10119,9 +11077,13 @@ CLASS="COMMAND"
 >You should get a list that looks like your <TT
 CLASS="FILENAME"
 >/etc/passwd</TT
-> 
-list followed by the domain users with their new uids, gids, home 
-directories and default shells.</P
+>
+list followed by the domain users with their new uids, gids, home
+directories and default shells.  If you do not, verify that the permissions on the
+libnss_winbind.so library are <TT
+CLASS="FILENAME"
+>rwxr-xr-x</TT
+>.</P
 ><P
 >The same thing can be done for groups with the command</P
 ><P
@@ -10138,150 +11100,32 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2167"
->11.5.3.6. Fix the <TT
-CLASS="FILENAME"
->/etc/rc.d/init.d/smb</TT
-> startup files</A
+NAME="AEN2358"
+>12.5.3.6. Configure Winbind and PAM</A
 ></H3
 ><P
->The <B
+>At this point we are assured that <B
 CLASS="COMMAND"
 >winbindd</B
-> daemon needs to start up after the 
-<B
-CLASS="COMMAND"
->smbd</B
 > and <B
 CLASS="COMMAND"
->nmbd</B
-> daemons are running.  
-To accomplish this task, you need to modify the <TT
-CLASS="FILENAME"
->/etc/init.d/smb</TT
+>smbd</B
 >
-script to add commands to invoke this daemon in the proper sequence.  My 
+are working together.  If you want to use winbind to provide authentication for other
+services, keep reading.  The pam configuration files need to be altered in
+this step.  (Did you remember to make backups of your original
 <TT
 CLASS="FILENAME"
->/etc/init.d/smb</TT
-> file starts up <B
-CLASS="COMMAND"
->smbd</B
->, 
-<B
-CLASS="COMMAND"
->nmbd</B
->, and <B
-CLASS="COMMAND"
->winbindd</B
-> from the 
-<TT
+>/etc/pam.d</TT
+> (or <TT
 CLASS="FILENAME"
->/usr/local/samba/bin</TT
-> directory directly.  The 'start' 
-function in the script looks like this:</P
-><P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->start() {
-        KIND="SMB"
-        echo -n $"Starting $KIND services: "
-        daemon /usr/local/samba/bin/smbd $SMBDOPTIONS
-        RETVAL=$?
-        echo
-        KIND="NMB"
-        echo -n $"Starting $KIND services: "
-        daemon /usr/local/samba/bin/nmbd $NMBDOPTIONS
-        RETVAL2=$?
-        echo
-        KIND="Winbind"
-        echo -n $"Starting $KIND services: "
-        daemon /usr/local/samba/bin/winbindd
-        RETVAL3=$?
-        echo
-        [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 -a $RETVAL3 -eq 0 ] &#38;&#38; touch /var/lock/subsys/smb || \
-           RETVAL=1
-        return $RETVAL
-}</PRE
-></TD
-></TR
-></TABLE
-></P
-><P
->The 'stop' function has a corresponding entry to shut down the 
-services and look s like this:</P
-><P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->stop() {
-        KIND="SMB"
-        echo -n $"Shutting down $KIND services: "
-        killproc smbd
-        RETVAL=$?
-        echo
-        KIND="NMB"
-        echo -n $"Shutting down $KIND services: "
-        killproc nmbd
-        RETVAL2=$?
-        echo
-        KIND="Winbind"
-        echo -n $"Shutting down $KIND services: "
-        killproc winbindd
-        RETVAL3=$?
-        [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 -a $RETVAL3 -eq 0 ] &#38;&#38; rm -f /var/lock/subsys/smb
-        echo ""
-        return $RETVAL
-}</PRE
-></TD
-></TR
-></TABLE
-></P
+>/etc/pam.conf</TT
+>) file[s]? If not, do it now.)</P
 ><P
->If you restart the <B
-CLASS="COMMAND"
->smbd</B
->, <B
-CLASS="COMMAND"
->nmbd</B
->, 
-and <B
+>You will need a PAM module to use <B
 CLASS="COMMAND"
 >winbindd</B
-> daemons at this point, you
-should be able to connect to the samba server as a domain member just as
-if you were a local user.</P
-></DIV
-><DIV
-CLASS="SECT3"
-><HR><H3
-CLASS="SECT3"
-><A
-NAME="AEN2189"
->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
-together.  If you want to use winbind to provide authentication for other 
-services, keep reading.  The pam configuration files need to be altered in
-this step.  (Did you remember to make backups of your original 
-<TT
-CLASS="FILENAME"
->/etc/pam.d</TT
-> files? If not, do it now.)</P
-><P
->You will need a pam module to use winbindd with these other services.  This 
+> with these other services.  This
 module will be compiled in the <TT
 CLASS="FILENAME"
 >../source/nsswitch</TT
@@ -10304,7 +11148,7 @@ CLASS="FILENAME"
 CLASS="FILENAME"
 >pam_winbind.so</TT
 > file should be copied to the location of
-your other pam security modules.  On my RedHat system, this was the
+your other pam security modules.  On Linux and Solaris systems, this is the
 <TT
 CLASS="FILENAME"
 >/lib/security</TT
@@ -10315,50 +11159,36 @@ CLASS="PROMPT"
 >root#</TT
 > <B
 CLASS="COMMAND"
->cp ../samba/source/nsswitch/pam_winbind.so /lib/security</B
-></P
-><P
->The <TT
-CLASS="FILENAME"
->/etc/pam.d/samba</TT
-> file does not need to be changed. I 
-just left this fileas it was:</P
-><P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->auth    required        /lib/security/pam_stack.so service=system-auth
-account required        /lib/security/pam_stack.so service=system-auth</PRE
-></TD
-></TR
-></TABLE
+>cp nsswitch/pam_winbind.so /lib/security</B
+>
+<TT
+CLASS="PROMPT"
+>root#</TT
+> <B
+CLASS="COMMAND"
+>chmod 755 /lib/security/pam_winbind.so</B
 ></P
 ><P
->The other services that I modified to allow the use of winbind 
-as an authentication service were the normal login on the console (or a terminal 
-session), telnet logins, and ftp service.  In order to enable these 
-services, you may first need to change the entries in 
+>Other services, such as the normal login on the console (or a terminal
+session), telnet logins, and ftp service, can be modified to allow the use of winbind
+as an authentication service.  In order to enable these
+services, you may first need to change the entries in
 <TT
 CLASS="FILENAME"
 >/etc/xinetd.d</TT
 > (or <TT
 CLASS="FILENAME"
 >/etc/inetd.conf</TT
->).  
-RedHat 7.1 uses the new xinetd.d structure, in this case you need 
+>).
+RedHat 7.1 uses the new xinetd.d structure, in this case you need
 to change the lines in <TT
 CLASS="FILENAME"
 >/etc/xinetd.d/telnet</TT
-> 
+>
 and <TT
 CLASS="FILENAME"
 >/etc/xinetd.d/wu-ftp</TT
-> from </P
+> from</P
 ><P
 ><TABLE
 BORDER="0"
@@ -10390,15 +11220,14 @@ CLASS="PROGRAMLISTING"
 ></TABLE
 ></P
 ><P
->	
-For ftp services to work properly, you will also need to either 
-have individual directories for the domain users already present on 
+>For ftp services to work properly, you will also need to either
+have individual directories for the domain users already present on
 the server, or change the home directory template to a general
-directory for all domain users.  These can be easily set using 
+directory for all domain users.  These can be easily set using
 the <TT
 CLASS="FILENAME"
 >smb.conf</TT
-> global entry 
+> global entry
 <B
 CLASS="COMMAND"
 >template homedir</B
@@ -10407,12 +11236,12 @@ CLASS="COMMAND"
 >The <TT
 CLASS="FILENAME"
 >/etc/pam.d/ftp</TT
-> file can be changed 
+> file can be changed
 to allow winbind ftp access in a manner similar to the
 samba file.  My <TT
 CLASS="FILENAME"
 >/etc/pam.d/ftp</TT
-> file was 
+> file was
 changed to look like this:</P
 ><P
 ><TABLE
@@ -10438,7 +11267,7 @@ session    required     /lib/security/pam_stack.so service=system-auth</PRE
 >The <TT
 CLASS="FILENAME"
 >/etc/pam.d/login</TT
-> file can be changed nearly the 
+> file can be changed nearly the
 same way.  It now looks like this:</P
 ><P
 ><TABLE
@@ -10467,12 +11296,12 @@ session    optional     /lib/security/pam_console.so</PRE
 >In this case, I added the <B
 CLASS="COMMAND"
 >auth sufficient /lib/security/pam_winbind.so</B
-> 
+>
 lines as before, but also added the <B
 CLASS="COMMAND"
 >required pam_securetty.so</B
-> 
-above it, to disallow root logins over the network.  I also added a 
+>
+above it, to disallow root logins over the network.  I also added a
 <B
 CLASS="COMMAND"
 >sufficient /lib/security/pam_unix.so use_first_pass</B
@@ -10480,8 +11309,32 @@ CLASS="COMMAND"
 line after the <B
 CLASS="COMMAND"
 >winbind.so</B
-> line to get rid of annoying 
+> line to get rid of annoying
 double prompts for passwords.</P
+><P
+>Note that a Solaris <TT
+CLASS="FILENAME"
+>/etc/pam.conf</TT
+> confiruation file looks
+very similar to this except thaty the service name is included as the first entry
+per line.  An example for the login service is given here.</P
+><P
+><TABLE
+BORDER="0"
+BGCOLOR="#E0E0E0"
+WIDTH="100%"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>## excerpt from /etc/pam.conf on a Solaris 8 system
+login   auth required   /lib/security/pam_winbind.so
+login   auth required   /lib/security/$ISA/pam_unix.so.1 try_first_pass
+login   auth required   /lib/security/$ISA/pam_dial_auth.so.1 try_first_pass</PRE
+></TD
+></TR
+></TABLE
+></P
 ></DIV
 ></DIV
 ></DIV
@@ -10490,38 +11343,28 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2236"
->11.6. Limitations</A
+NAME="AEN2411"
+>12.6. Limitations</A
 ></H1
 ><P
->Winbind has a number of limitations in its current 
-	released version that we hope to overcome in future 
+>Winbind has a number of limitations in its current
+	released version that we hope to overcome in future
 	releases:</P
 ><P
 ></P
 ><UL
 ><LI
 ><P
->Winbind is currently only available for 
-		the Linux operating system, although ports to other operating 
-		systems are certainly possible. For such ports to be feasible, 
-		we require the C library of the target operating system to 
-		support the Name Service Switch and Pluggable Authentication
-		Modules systems. This is becoming more common as NSS and 
-		PAM gain	support among UNIX vendors.</P
-></LI
-><LI
-><P
->The mappings of Windows NT RIDs to UNIX ids 
-		is not made algorithmically and depends on the order in which 
-		unmapped users or groups are seen by winbind. It may be difficult 
-		to recover the mappings of rid to UNIX id mapping if the file 
+>The mappings of Windows NT RIDs to UNIX ids
+		is not made algorithmically and depends on the order in which
+		unmapped users or groups are seen by winbind. It may be difficult
+		to recover the mappings of rid to UNIX id mapping if the file
 		containing this information is corrupted or destroyed.</P
 ></LI
 ><LI
 ><P
->Currently the winbind PAM module does not take 
-		into account possible workstation and logon time restrictions 
+>Currently the winbind PAM module does not take
+		into account possible workstation and logon time restrictions
 		that may be been set for Windows NT users.</P
 ></LI
 ></UL
@@ -10531,8 +11374,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2246"
->11.7. Conclusion</A
+NAME="AEN2419"
+>12.7. Conclusion</A
 ></H1
 ><P
 >The winbind system, through the use of the Name Service 
@@ -10548,23 +11391,23 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="OS2"
->Chapter 12. OS2 Client HOWTO</A
+>Chapter 13. OS2 Client HOWTO</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2260"
->12.1. FAQs</A
+NAME="AEN2433"
+>13.1. FAQs</A
 ></H1
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2262"
->12.1.1. How can I configure OS/2 Warp Connect or 
+NAME="AEN2435"
+>13.1.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
 ><P
@@ -10622,8 +11465,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2277"
->12.1.2. How can I configure OS/2 Warp 3 (not Connect), 
+NAME="AEN2450"
+>13.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
@@ -10675,8 +11518,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2286"
->12.1.3. Are there any other issues when OS/2 (any version) 
+NAME="AEN2459"
+>13.1.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
 ><P
@@ -10697,8 +11540,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2290"
->12.1.4. How do I get printer driver download working 
+NAME="AEN2463"
+>13.1.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
 ><P
@@ -10746,15 +11589,15 @@ CLASS="CHAPTER"
 ><HR><H1
 ><A
 NAME="CVS-ACCESS"
->Chapter 13. HOWTO Access Samba source code via CVS</A
+>Chapter 14. HOWTO Access Samba source code via CVS</A
 ></H1
 ><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2306"
->13.1. Introduction</A
+NAME="AEN2479"
+>14.1. Introduction</A
 ></H1
 ><P
 >Samba is developed in an open environment.  Developers use CVS
@@ -10775,8 +11618,8 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2311"
->13.2. CVS Access to samba.org</A
+NAME="AEN2484"
+>14.2. CVS Access to samba.org</A
 ></H1
 ><P
 >The machine samba.org runs a publicly accessible CVS 
@@ -10788,8 +11631,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2314"
->13.2.1. Access via CVSweb</A
+NAME="AEN2487"
+>14.2.1. Access via CVSweb</A
 ></H2
 ><P
 >You can access the source code via your 
@@ -10809,8 +11652,8 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2319"
->13.2.2. Access via cvs</A
+NAME="AEN2492"
+>14.2.2. Access via cvs</A
 ></H2
 ><P
 >You can also access the source code via a 
@@ -10915,14 +11758,14 @@ CLASS="COMMAND"
 ></DIV
 ><HR><H1
 ><A
-NAME="AEN2347"
+NAME="AEN2520"
 >Index</A
 ></H1
 ><DL
 ><DT
 >Primary Domain Controller,
     <A
-HREF="x1100.htm"
+HREF="x1242.htm"
 >Background</A
 >
   </DT
diff --git a/docs/htmldocs/UNIX_INSTALL.html b/docs/htmldocs/UNIX_INSTALL.html
index 35b1d9b01bc..707fd87245b 100644
--- a/docs/htmldocs/UNIX_INSTALL.html
+++ b/docs/htmldocs/UNIX_INSTALL.html
@@ -478,7 +478,7 @@ CLASS="REPLACEABLE"
 ></TT
 ></P
 ><P
->Your should get back a list of shares available on 
+>You should get back a list of shares available on 
 	your server. If you don't then something is incorrectly setup. 
 	Note that this method can also be used to see what shares 
 	are available on other LanManager clients (such as WfWg).</P
diff --git a/docs/htmldocs/cups.html b/docs/htmldocs/cups.html
new file mode 100644
index 00000000000..4c07986acaa
--- /dev/null
+++ b/docs/htmldocs/cups.html
@@ -0,0 +1,588 @@
+<HTML
+><HEAD
+><TITLE
+>Printing with CUPS in Samba 2.2.x</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.57"></HEAD
+><BODY
+CLASS="ARTICLE"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
+><DIV
+CLASS="ARTICLE"
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+><A
+NAME="CUPS"
+>Printing with CUPS in Samba 2.2.x</A
+></H1
+><HR></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="AEN3"
+>Printing with CUPS in Samba 2.2.x</A
+></H1
+><P
+><A
+HREF="http://www.cups.org/"
+TARGET="_top"
+>CUPS</A
+> is a newcomer in
+the UNIX printing scene, which has convinced many people upon first trial
+already. However, it has quite a few new features, which make it different
+from other, more traditional printing systems.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN7"
+>Configuring <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> for CUPS</A
+></H1
+><P
+>Printing with CUPS in the most basic <TT
+CLASS="FILENAME"
+>smb.conf</TT
+>
+setup in Samba 2.2.x only needs two settings: <B
+CLASS="COMMAND"
+>printing = cups</B
+> and
+<B
+CLASS="COMMAND"
+>printcap = cups</B
+>. While CUPS itself doesn't need a printcap
+anymore, the <TT
+CLASS="FILENAME"
+>cupsd.conf</TT
+> configuration file knows two directives
+(example: <B
+CLASS="COMMAND"
+>Printcap /etc/printcap</B
+> and <B
+CLASS="COMMAND"
+>PrintcapFormat
+BSD</B
+>), which control if such a file should be created for the
+convenience of third party applications. Make sure it is set! For details see
+<B
+CLASS="COMMAND"
+>man cupsd.conf</B
+> and other CUPS-related documentation.</P
+><P
+>If SAMBA is compiled against libcups, then <B
+CLASS="COMMAND"
+>printcap =
+cups</B
+> uses the CUPS API to list printers, submit jobs, etc. Otherwise it
+maps to the System V commands with an additional <TT
+CLASS="PARAMETER"
+><I
+>-oraw</I
+></TT
+>
+option for printing. You can use the <B
+CLASS="COMMAND"
+>ldd</B
+> command to
+find out details:</P
+><P
+><PRE
+CLASS="PROGRAMLISTING"
+>transmeta:/home/kurt # ldd `which smbd`
+        libssl.so.0.9.6 =&#62; /usr/lib/libssl.so.0.9.6 (0x4002d000)
+        libcrypto.so.0.9.6 =&#62; /usr/lib/libcrypto.so.0.9.6 (0x4005a000)
+        libcups.so.2 =&#62; /usr/lib/libcups.so.2 (0x40123000)
+        libdl.so.2 =&#62; /lib/libdl.so.2 (0x401e8000)
+        libnsl.so.1 =&#62; /lib/libnsl.so.1 (0x401ec000)
+        libpam.so.0 =&#62; /lib/libpam.so.0 (0x40202000)
+        libc.so.6 =&#62; /lib/libc.so.6 (0x4020b000)
+        /lib/ld-linux.so.2 =&gt; /lib/ld-linux.so.2 (0x40000000)</PRE
+></P
+><P
+>The line "libcups.so.2 =&gt; /usr/lib/libcups.so.2
+(0x40123000)" shows there is CUPS support compiled into this version of
+Samba. If this is the case, and <B
+CLASS="COMMAND"
+>printing = cups</B
+> is set, then any
+otherwise manually set print command in smb.conf is ignored.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN26"
+>Using CUPS as a mere spooling print server -- "raw"
+printing with vendor drivers download</A
+></H1
+><P
+>You can setup Samba and your Windows clients to use the
+CUPS print subsystem just as you would with any of the more traditional print
+subsystems: that means the use of vendor provided, native Windows printer
+drivers for each target printer. If you setup the [print$] share to
+download these drivers to the clients, their GDI system (Graphical Device
+Interface) will output the Wndows EMF (Enhanced MetaFile) and
+convert it -- with the help of the printer driver -- locally into the format
+the printer is expecting. Samba and the CUPS print subsystem will have to
+treat these files as raw print files  -- they are already in the
+shape to be digestable for the printer. This is the same traditional setup
+for Unix print servers handling Windows client jobs. It does not take much
+CPU power to handle this kind of task efficiently.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN29"
+>CUPS as a network PostScript RIP -- CUPS drivers working on server, Adobe
+PostScript driver with CUPS-PPDs downloaded to clients</A
+></H1
+><P
+>CUPS is perfectly able to use PPD files (PostScript
+Printer Descriptions). PPDs can control all print device options. They
+are usually provided by the manufacturer -- if you own a PostSript printer,
+that is. PPD files are always a component of PostScript printer drivers on MS
+Windows or Apple Mac OS systems. They are ASCII files containing
+user-selectable print options, mapped to appropriate PostScript, PCL or PJL
+commands for the target printer. Printer driver GUI dialogs translate these
+options "on-the-fly" into buttons and drop-down lists for the user to
+select.</P
+><P
+>CUPS can load, without any conversions, the PPD file from
+any Windows (NT is recommended) PostScript driver and handle the options.
+There is a web browser interface to the print options (select
+http://localhost:631/printers/ and click on one "Configure Printer" button
+to see it), a commandline interface (see <B
+CLASS="COMMAND"
+>man lpoptions</B
+> or
+try if you have <B
+CLASS="COMMAND"
+>lphelp</B
+> on your system) plus some different GUI frontends on Linux
+UNIX, which can present PPD options to the users. PPD optons are normally
+meant to become evaluated by the PostScript RIP on the real PostScript
+printer.</P
+><P
+>CUPS doesn't stop at "real" PostScript printers in its
+usage of PPDs. The CUPS developers have extended the PPD concept, to also
+describe available device and driver options for non-PostScript printers
+through  CUPS-PPDs.</P
+><P
+>This is logical, as CUPS includes a fully featured
+PostScript interpreter (RIP). This RIP is based on Ghostscript. It can
+process all received PostScript (and additionally many other file formats)
+from clients. All CUPS-PPDs geared to non-PostScript printers contain an
+additional line, starting with the keyword <TT
+CLASS="PARAMETER"
+><I
+>*cupsFilter</I
+></TT
+>
+this line
+tells the CUPS print system which printer-specific filter to use for the
+interpretation of the accompanying PostScript. Thus CUPS lets all its
+printers appear as PostScript devices to its clients, because it can act as a
+PostScript RIP for those printers, processing the received PostScript code
+into a proper raster print format.</P
+><P
+>CUPS-PPDs can also be used on Windows-Clients, on top of a
+PostScript driver (recommended is the Adobe one).</P
+><P
+>This feature enables CUPS to do a few tricks no other
+spooler can do:</P
+><P
+></P
+><UL
+><LI
+><P
+>act as a networked PostScript RIP (Raster Image Processor), handling
+    printfiles from all client platforms in a uniform way;</P
+></LI
+><LI
+><P
+>act as a central accounting and billing server, as all files are passed
+    through the <B
+CLASS="COMMAND"
+>pstops</B
+> Filter and are therefor logged in
+    the CUPS <TT
+CLASS="FILENAME"
+>page&lowbar;log  </TT
+> <I
+CLASS="EMPHASIS"
+>NOTE: </I
+>this
+    can not happen with "raw" print jobs, which always remain unfiltered
+    per definition;</P
+></LI
+><LI
+><P
+>enable clients to consolidate on a single PostScript driver, even for
+    many different target printers.</P
+></LI
+></UL
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN50"
+>Windows Terminal Servers (WTS) as CUPS clients</A
+></H1
+><P
+>This setup may be of special interest to people
+experiencing major problems in WTS environments. WTS need often a multitude
+of non-PostScript drivers installed to run their clients' multitude of
+different printer models. This often imposes the price of much increased
+instability. In many cases, in an attempt to overcome this problem, site
+administrators have resorted to restrict the allowed drivers installed on
+their WTS to one generic PCL- and one PostScript driver. This however
+restricts the clients in the amount of printer options available for them --
+often they can't get out more then simplex prints from one standard paper
+tray, while their devices could do much better, if driven by a different
+driver!</P
+><P
+>Using an Adobe PostScript driver, enabled with a CUPS-PPD,
+seems to be a very elegant way to overcome all these shortcomings. The
+PostScript driver is not known to cause major stability problems on WTS (even
+if used with many different PPDs). The clients will be able to (again) chose
+paper trays, duplex printing and other settings. However, there is a certain
+price for this too: a  CUPS server acting as a PostScript RIP for its clients
+requires more CPU and RAM than just to act as  a "raw spooling" device. Plus,
+this setup is not yet widely tested, although the first feedbacks look very
+promising...</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN54"
+>Setting up CUPS for driver download</A
+></H1
+><P
+>The <B
+CLASS="COMMAND"
+>cupsadsmb</B
+> utility (shipped with all current
+CUPS versions) makes the sharing of any (or all) installed CUPS printers very
+easy. Prior to using it, you need the following settings in smb.conf:</P
+><P
+><PRE
+CLASS="PROGRAMLISTING"
+>[global]
+         load printers = yes
+         printing = cups
+         printcap name = cups
+
+[printers]
+         comment = All Printers
+         path = /var/spool/samba
+         browseable = no
+         public = yes
+         guest ok = yes
+         writable = no
+         printable = yes
+         printer admin = root
+
+[print$]
+         comment = Printer Drivers
+         path = /etc/samba/drivers
+         browseable = yes
+         guest ok = no
+         read only = yes
+         write list = root</PRE
+></P
+><P
+>For licensing reasons the necessary files of the Adobe
+Postscript driver can not be distributed with either Samba or CUPS. You need
+to download them yourself from the Adobe website. Once extracted, create a
+<TT
+CLASS="FILENAME"
+>drivers</TT
+> directory in the CUPS data directory (usually
+<TT
+CLASS="FILENAME"
+>/usr/share/cups/</TT
+>). Copy the Adobe files using
+UPPERCASE filenames, to this directory as follows:</P
+><P
+><PRE
+CLASS="PROGRAMLISTING"
+>        ADFONTS.MFM
+        ADOBEPS4.DRV
+        ADOBEPS4.HLP
+        ADOBEPS5.DLL
+        ADOBEPSU.DLL
+        ADOBEPSU.HLP
+        DEFPRTR2.PPD
+        ICONLIB.DLL</PRE
+></P
+><P
+>Users of the ESP Print Pro software are able to isntall
+their "Samba Drivers" package for this purpose with no problem.</P
+></DIV
+><DIV
+CLASS="SECT1"
+><HR><H1
+CLASS="SECT1"
+><A
+NAME="AEN66"
+>Sources of CUPS drivers / PPDs</A
+></H1
+><P
+>On the internet you can find now many thousand CUPS-PPD
+files (with their companion filters), in many national languages,
+supporting more than 1.000 non-PostScript models.</P
+><P
+></P
+><UL
+><LI
+><P
+><A
+HREF="http://wwwl.easysw.com/printpro/"
+TARGET="_top"
+>ESP PrintPro
+    (http://wwwl.easysw.com/printpro/)</A
+>
+    (commercial, non-Free) is packaged with more than 3.000 PPDs, ready for
+    successful usage "out of the box" on Linux, IBM-AIX, HP-UX, Sun-Solaris,
+    SGI-IRIX, Compaq Tru64, Digital Unix and some more commercial Unices (it
+    is written by the CUPS developers themselves and its sales help finance
+    the further development of CUPS, as they feed their creators)</P
+></LI
+><LI
+><P
+>the <A
+HREF="http://gimp-print.sourceforge.net/"
+TARGET="_top"
+>Gimp-Print-Project
+    (http://gimp-print.sourceforge.net/)</A
+>
+    (GPL, Free Software) provides around 120 PPDs (supporting nearly 300
+    printers, many driven to photo quality output), to be used alongside the
+    Gimp-Print CUPS filters;</P
+></LI
+><LI
+><P
+><A
+HREF="http://www.turboprint.com/"
+TARGET="_top"
+>TurboPrint
+    (http://www.turboprint.com/)</A
+>
+    (Shareware, non-Freee) supports roughly the same amount of printers in
+    excellent quality;</P
+></LI
+><LI
+><P
+><A
+HREF="http://www-124.ibm.com/developerworks/oss/linux/projects/omni/"
+TARGET="_top"
+>OMNI
+    (http://www-124.ibm.com/developerworks/oss/linux/projects/omni/)</A
+>
+    (LPGL, Free) is a package made by IBM, now containing support for more
+    than 400 printers, stemming from the inheritance of IBM OS/2 KnowHow
+    ported over to Linux (CUPS support is in a Beta-stage at present);</P
+></LI
+><LI
+><P
+><A
+HREF="http://hpinkjet.sourceforge.net/"
+TARGET="_top"
+>HPIJS
+    (http://hpinkjet.sourceforge.net/)</A
+>
+    (BSD-style licnes, Free) supports around 120 of HP's own printers and is
+    also providing excellent print quality now;</P
+></LI
+><LI
+><P
+><A
+HREF="http://www.linuxprinting.org/"
+TARGET="_top"
+>Foomatic/cupsomatic (http://www.linuxprinting.org/)</A
+> 
+    (LPGL, Free) from Linuxprinting.org are providing PPDs for practically every
+    Ghostscript filter known to the world, now usable with CUPS.</P
+></LI
+></UL
+><P
+><I
+CLASS="EMPHASIS"
+>NOTE: </I
+>the cupsomatic trick from Linuxprinting.org is
+working different from the other drivers. While the other drivers take the
+generic CUPS raster (produced by CUPS' own pstoraster PostScript RIP) as
+their input, cupsomatic "kidmaps" the PostScript inside CUPS, before
+RIP-ping, deviates it to an external Ghostscript installation (which now
+becomes the RIP) and gives it back to a CUPS backend once Ghostscript is
+finished.</P
+><P
+>Once you installed a printer inside CUPS with one of the
+recommended methods (the lpadmin command, the web browser interface or one of
+the available GUI wizards), you can use <B
+CLASS="COMMAND"
+>cupsaddsmb</B
+> to share the
+printer via Samba. <B
+CLASS="COMMAND"
+>cupsaddsmb</B
+> prepares the driver files for
+comfortable client download and installation upon their first contact with
+this printer share.</P
+><DIV
+CLASS="SECT2"
+><HR><H2
+CLASS="SECT2"
+><A
+NAME="AEN93"
+><B
+CLASS="COMMAND"
+>cupsaddsmb</B
+></A
+></H2
+><P
+>The <B
+CLASS="COMMAND"
+>cupsaddsmb</B
+> command copies the needed files
+for convenient Windows client installations from the previously prepared CUPS
+data directory to your [print$] share. Additionally, the PPD
+associated with this printer is copied from <TT
+CLASS="FILENAME"
+>/etc/cups/ppd/</TT
+> to
+[print$].</P
+><P
+><PRE
+CLASS="PROGRAMLISTING"
+><TT
+CLASS="PROMPT"
+>root# </TT
+> <B
+CLASS="COMMAND"
+>cupsaddsmb -U root infotec_IS2027</B
+>
+Password for root required to access localhost via SAMBA: <TT
+CLASS="USERINPUT"
+><B
+>[type in password 'secret']</B
+></TT
+></PRE
+></P
+><P
+>To share all printers and drivers, use the <TT
+CLASS="PARAMETER"
+><I
+>-a</I
+></TT
+>
+parameter instead of a printer name.</P
+><P
+>Probably you want to see what's going on. Use the
+<TT
+CLASS="PARAMETER"
+><I
+>-v</I
+></TT
+> parameter to get a more verbose output:</P
+><P
+><PRE
+CLASS="PROGRAMLISTING"
+><TT
+CLASS="PROMPT"
+>root# </TT
+> cupsaddsmb -v -U root infotec_IS2027
+    Password for root required to access localhost via SAMBA:
+    Running command: smbclient //localhost/print\$ -N -U'root%secret' -c 'mkdir W32X86;put /var/spool/cups/tmp/3cd1cc66376c0 W32X86/infotec_IS2027.PPD;put /usr/share/cups/drivers/ADOBEPS5.DLL W32X86/ADOBEPS5.DLL;put /usr/share/cups/drivers/ADOBEPSU.DLL W32X86/ADOBEPSU.DLL;put /usr/share/cups/drivers/ADOBEPSU.HLP W32X86/ADOBEPSU.HLP'
+    added interface ip=10.160.16.45 bcast=10.160.31.255 nmask=255.255.240.0
+    added interface ip=192.168.182.1 bcast=192.168.182.255 nmask=255.255.255.0
+    added interface ip=172.16.200.1 bcast=172.16.200.255 nmask=255.255.255.0
+    Domain=[TUX-NET] OS=[Unix] Server=[Samba 2.2.3a.200204262025cvs]
+    NT_STATUS_OBJECT_NAME_COLLISION making remote directory \W32X86
+    putting file /var/spool/cups/tmp/3cd1cc66376c0 as \W32X86/infotec_IS2027.PPD (17394.6 kb/s) (average 17395.2 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPS5.DLL as \W32X86/ADOBEPS5.DLL (10877.4 kb/s) (average 11343.0 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPSU.DLL as \W32X86/ADOBEPSU.DLL (5095.2 kb/s) (average 9260.4 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPSU.HLP as \W32X86/ADOBEPSU.HLP (8828.7 kb/s) (average 9247.1 kb/s)
+
+    Running command: smbclient //localhost/print\$ -N -U'root%secret' -c 'mkdir WIN40;put /var/spool/cups/tmp/3cd1cc66376c0 WIN40/infotec_IS2027.PPD;put /usr/share/cups/drivers/ADFONTS.MFM WIN40/ADFONTS.MFM;put /usr/share/cups/drivers/ADOBEPS4.DRV WIN40/ADOBEPS4.DRV;put /usr/share/cups/drivers/ADOBEPS4.HLP WIN40/ADOBEPS4.HLP;put /usr/share/cups/drivers/DEFPRTR2.PPD WIN40/DEFPRTR2.PPD;put /usr/share/cups/drivers/ICONLIB.DLL WIN40/ICONLIB.DLL;put /usr/share/cups/drivers/PSMON.DLL WIN40/PSMON.DLL;'
+    added interface ip=10.160.16.45 bcast=10.160.31.255 nmask=255.255.240.0
+    added interface ip=192.168.182.1 bcast=192.168.182.255 nmask=255.255.255.0
+    added interface ip=172.16.200.1 bcast=172.16.200.255 nmask=255.255.255.0
+    Domain=[TUX-NET] OS=[Unix] Server=[Samba 2.2.3a.200204262025cvs]
+    NT_STATUS_OBJECT_NAME_COLLISION making remote directory \WIN40
+    putting file /var/spool/cups/tmp/3cd1cc66376c0 as \WIN40/infotec_IS2027.PPD (26091.5 kb/s) (average 26092.8 kb/s)
+    putting file /usr/share/cups/drivers/ADFONTS.MFM as \WIN40/ADFONTS.MFM (11241.6 kb/s) (average 11812.9 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPS4.DRV as \WIN40/ADOBEPS4.DRV (16640.6 kb/s) (average 14679.3 kb/s)
+    putting file /usr/share/cups/drivers/ADOBEPS4.HLP as \WIN40/ADOBEPS4.HLP (11285.6 kb/s) (average 14281.5 kb/s)
+    putting file /usr/share/cups/drivers/DEFPRTR2.PPD as \WIN40/DEFPRTR2.PPD (823.5 kb/s) (average 12944.0 kb/s)
+    putting file /usr/share/cups/drivers/ICONLIB.DLL as \WIN40/ICONLIB.DLL (19226.2 kb/s) (average 13169.7 kb/s)
+    putting file /usr/share/cups/drivers/PSMON.DLL as \WIN40/PSMON.DLL (18666.1 kb/s) (average 13266.7 kb/s)
+
+    Running command: rpcclient localhost -N -U'root%secret' -c 'adddriver "Windows NT x86" "infotec_IS2027:ADOBEPS5.DLL:infotec_IS2027.PPD:ADOBEPSU.DLL:ADOBEPSU.HLP:NULL:RAW:NULL"'
+    cmd = adddriver "Windows NT x86" "infotec_IS2027:ADOBEPS5.DLL:infotec_IS2027.PPD:ADOBEPSU.DLL:ADOBEPSU.HLP:NULL:RAW:NULL"
+    Printer Driver infotec_IS2027 successfully installed.
+
+    Running command: rpcclient localhost -N -U'root%secret' -c 'adddriver "Windows 4.0" "infotec_IS2027:ADOBEPS4.DRV:infotec_IS2027.PPD:NULL:ADOBEPS4.HLP:PSMON.DLL:RAW:ADFONTS.MFM,DEFPRTR2.PPD,ICONLIB.DLL"'
+    cmd = adddriver "Windows 4.0" "infotec_IS2027:ADOBEPS4.DRV:infotec_IS2027.PPD:NULL:ADOBEPS4.HLP:PSMON.DLL:RAW:ADFONTS.MFM,DEFPRTR2.PPD,ICONLIB.DLL"
+    Printer Driver infotec_IS2027 successfully installed.
+
+    Running command: rpcclient localhost -N -U'root%secret' -c 'setdriver infotec_IS2027 infotec_IS2027'
+    cmd = setdriver infotec_IS2027 infotec_IS2027
+    Succesfully set infotec_IS2027 to driver infotec_IS2027.
+
+    <TT
+CLASS="PROMPT"
+>root# </TT
+></PRE
+></P
+><P
+>If you look closely, you'll discover your root password
+was transfered unencrypted over the wire, so beware! Also, if you look
+further her, you'll discover error messages like
+<TT
+CLASS="CONSTANT"
+>NT_STATUS_OBJECT_NAME_COLLISION</TT
+> in between. They occur, because
+the directories <TT
+CLASS="FILENAME"
+>WIN40</TT
+> and <TT
+CLASS="FILENAME"
+>W32X86</TT
+> already
+existed in the [print$] driver download share (from a previous driver
+installation). They are harmless here.</P
+><P
+>Now your printer is prepared for the clients to use. From
+a client, browse to the CUPS/Samba server, open the "Printers"
+share, right-click on this printer and select "Install..." or
+"Connect..." (depending on the Windows version you use). Now their
+should be a new printer in your client's local "Printers" folder,
+named (in my case) "infotec_IS2027 on kdebitshop"</P
+></DIV
+></DIV
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/docs/htmldocs/nmblookup.1.html b/docs/htmldocs/nmblookup.1.html
index c87d7d35db9..22cc35526cc 100644
--- a/docs/htmldocs/nmblookup.1.html
+++ b/docs/htmldocs/nmblookup.1.html
@@ -37,12 +37,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >nmblookup</B
->  [-M] [-R] [-S] [-r] [-A] [-h] [-B &#60;broadcast address&#62;] [-U &#60;unicast address&#62;] [-d &#60;debug level&#62;] [-s &#60;smb config file&#62;] [-i &#60;NetBIOS scope&#62;] [-T] {name}</P
+>  [-f] [-M] [-R] [-S] [-r] [-A] [-h] [-B &#60;broadcast address&#62;] [-U &#60;unicast address&#62;] [-d &#60;debug level&#62;] [-s &#60;smb config file&#62;] [-i &#60;NetBIOS scope&#62;] [-T] {name}</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24"
+NAME="AEN25"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -65,7 +65,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN30"
+NAME="AEN31"
 ></A
 ><H2
 >OPTIONS</H2
@@ -75,6 +75,15 @@ NAME="AEN30"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
+>-f</DT
+><DD
+><P
+>Causes nmblookup to print out the flags
+		in the NMB packet headers. These flags will print out as 
+		strings like Authoritative, Recursion_Desired, Recursion_available, etc.
+		</P
+></DD
+><DT
 >-M</DT
 ><DD
 ><P
@@ -293,7 +302,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN110"
+NAME="AEN115"
 ></A
 ><H2
 >EXAMPLES</H2
@@ -330,7 +339,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN122"
+NAME="AEN127"
 ></A
 ><H2
 >VERSION</H2
@@ -341,7 +350,7 @@ NAME="AEN122"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN125"
+NAME="AEN130"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -368,7 +377,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN132"
+NAME="AEN137"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 5663fa89446..2d7358330f4 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -590,6 +590,9 @@ CLASS="VARIABLELIST"
 >the NetBIOS name of the server. This allows you 
 		to change your config based on what the client calls you. Your 
 		server can have a "dual personality".</P
+><P
+>Note that this paramater is not available when Samba listens
+                on port 445, as clients no longer send this information </P
 ></DD
 ><DT
 >%M</DT
@@ -686,7 +689,7 @@ CLASS="REPLACEABLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN202"
+NAME="AEN203"
 ></A
 ><H2
 >NAME MANGLING</H2
@@ -709,6 +712,23 @@ NAME="AEN202"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
+>mangling method</DT
+><DD
+><P
+> controls the algorithm used for the generating
+		the mangled names. Can take two different values, "hash" and
+		"hash2". "hash" is  the default and is the algorithm that has been
+		used in Samba for many years. "hash2" is a newer and considered
+		a better algorithm (generates less collisions) in the names.
+		However, many Win32 applications store the
+		mangled names and so changing to the new algorithm must not be done
+		lightly as these applications may break unless reinstalled.
+		New installations of Samba may set the default to hash2.
+		Default <EM
+>hash</EM
+>.</P
+></DD
+><DT
 >mangle case = yes/no</DT
 ><DD
 ><P
@@ -771,7 +791,7 @@ CLASS="VARIABLELIST"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN235"
+NAME="AEN241"
 ></A
 ><H2
 >NOTE ABOUT USERNAME/PASSWORD VALIDATION</H2
@@ -849,7 +869,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN254"
+NAME="AEN260"
 ></A
 ><H2
 >COMPLETE LIST OF GLOBAL PARAMETERS</H2
@@ -1726,6 +1746,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#MANGLINGMETHOD"
+><TT
+CLASS="PARAMETER"
+><I
+>mangling method</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#MAPTOGUEST"
 ><TT
 CLASS="PARAMETER"
@@ -3036,7 +3068,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN982"
+NAME="AEN992"
 ></A
 ><H2
 >COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -3469,6 +3501,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#FORCEUNKNOWNACLUSER"
+><TT
+CLASS="PARAMETER"
+><I
+>force unknown acl user</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#FORCEUSER"
 ><TT
 CLASS="PARAMETER"
@@ -4515,7 +4559,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1474"
+NAME="AEN1488"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -5107,7 +5151,7 @@ NAME="ANNOUNCEVERSION"
 ><P
 >This specifies the major and minor version numbers 
 		that nmbd will use when announcing itself as a server. The default 
-		is 4.2.  Do not change this parameter unless you have a specific 
+		is 4.5.  Do not change this parameter unless you have a specific 
 		need to set a Samba server to be a downlevel server.</P
 ><P
 >Default: <B
@@ -5480,7 +5524,7 @@ NAME="CASESENSITIVE"
 ><DD
 ><P
 >See the discussion in the section <A
-HREF="#AEN202"
+HREF="#AEN203"
 >NAME MANGLING</A
 >.</P
 ><P
@@ -6609,7 +6653,7 @@ NAME="DEFAULTCASE"
 ><DD
 ><P
 >See the section on <A
-HREF="#AEN202"
+HREF="#AEN203"
 >		NAME MANGLING</A
 >. Also note the <A
 HREF="#SHORTPRESERVECASE"
@@ -8563,6 +8607,49 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="FORCEUNKNOWNACLUSER"
+></A
+>force unknown acl user (S)</DT
+><DD
+><P
+>If this parameter is set, a Windows NT ACL that contains
+		an unknown SID (security descriptor, or representation of a user or group id)
+		as the owner or group owner of the file will be silently mapped into the
+		current UNIX uid or gid of the currently connected user.</P
+><P
+>This is designed to allow Windows NT clients to copy files and
+		folders containing ACLs that were created locally on the client machine
+		and contain users local to that machine only (no domain users) to be
+		copied to a Samba server (usually with XCOPY /O) and have the unknown
+		userid and groupid of the file owner map to the current connected user.
+		This can only be fixed correctly when winbindd allows arbitrary mapping
+		from any Windows NT SID to a UNIX uid or gid.</P
+><P
+>Try using this parameter when XCOPY /O gives an ACCESS_DENIED error.
+		</P
+><P
+>See also <A
+HREF="#FORCEGROUP"
+><TT
+CLASS="PARAMETER"
+><I
+>force group
+		</I
+></TT
+></A
+></P
+><P
+>Default: <EM
+>False</EM
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>force unknown acl user = yes</B
+></P
+></DD
+><DT
+><A
 NAME="FORCEUSER"
 ></A
 >force user (S)</DT
@@ -9881,7 +9968,12 @@ HREF="#LDAPSSL"
 ><P
 >Default : <B
 CLASS="COMMAND"
->ldap port = 636</B
+>ldap port = 636 ; if ldap ssl = on</B
+></P
+><P
+>Default : <B
+CLASS="COMMAND"
+>ldap port = 389 ; if ldap ssl = off</B
 ></P
 ></DD
 ><DT
@@ -11304,7 +11396,7 @@ NAME="MANGLECASE"
 ><DD
 ><P
 >See the section on <A
-HREF="#AEN202"
+HREF="#AEN203"
 >		NAME MANGLING</A
 ></P
 ><P
@@ -11376,11 +11468,11 @@ NAME="MANGLEDNAMES"
 		or whether non-DOS names should simply be ignored.</P
 ><P
 >See the section on <A
-HREF="#AEN202"
+HREF="#AEN203"
 >		NAME MANGLING</A
 > for details on how to control the mangling process.</P
 ><P
->If mangling is used then the mangling algorithm is as follows:</P
+>If mangling algorithm "hash" is used then the mangling algorithm is as follows:</P
 ><P
 ></P
 ><UL
@@ -11438,6 +11530,60 @@ CLASS="PARAMETER"
 		in a directory share the same first five alphanumeric characters. 
 		The probability of such a clash is 1/1300.</P
 ><P
+>If mangling algorithm "hash2" is used then the mangling algorithm is as follows:</P
+><P
+></P
+><UL
+><LI
+><P
+>The first alphanumeric character 
+			before the rightmost dot of the filename is preserved, forced 
+			to upper case, and appears as the first character of the mangled name.
+			</P
+></LI
+><LI
+><P
+>A base63 hash of 5 characters is generated and the
+			first 4 characters of that hash are appended to the first character.
+			</P
+></LI
+><LI
+><P
+>A tilde "~" is appended to the first part of the mangled
+			name, followed by the final character of the base36 hash of the name.
+			</P
+><P
+>Note that the character to use may be specified using 
+			the <A
+HREF="#MANGLINGCHAR"
+><TT
+CLASS="PARAMETER"
+><I
+>mangling char</I
+></TT
+>
+			</A
+> option, if you don't like '~'.</P
+></LI
+><LI
+><P
+>The first three alphanumeric characters of the final 
+			extension are preserved, forced to upper case and appear as the 
+			extension of the mangled name. The final extension is defined as that 
+			part of the original filename after the rightmost dot. If there are no 
+			dots in the filename, the mangled name will have no extension (except 
+			in the case of "hidden files" - see below).</P
+></LI
+><LI
+><P
+>Files whose UNIX name begins with a dot will be 
+			presented as DOS hidden files. The mangled name will be created as 
+			for other filenames, but with the leading dot removed and "___" as 
+			its extension regardless of actual original extension (that's three 
+			underscores).</P
+></LI
+></UL
+><P
 >The name mangling (if enabled) allows a file to be 
 		copied between UNIX directories from Windows/DOS while retaining 
 		the long UNIX filename. UNIX files can be renamed to a new extension 
@@ -11497,7 +11643,7 @@ NAME="MANGLINGCHAR"
 		the <EM
 >magic</EM
 > character in <A
-HREF="#AEN202"
+HREF="#AEN203"
 >name mangling</A
 >. The default is a '~'
 		but this may interfere with some software. Use this option to set 
@@ -11515,6 +11661,33 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="MANGLINGMETHOD"
+></A
+>mangling mathod(G)</DT
+><DD
+><P
+> controls the algorithm used for the generating
+                the mangled names. Can take two different values, "hash" and
+                "hash2". "hash" is  the default and is the algorithm that has been
+                used in Samba for many years. "hash2" is a newer and considered
+                a better algorithm (generates less collisions) in the names.
+                However, many Win32 applications store the mangled names and so
+		changing to the new algorithm must not be done
+                lightly as these applications may break unless reinstalled.
+                New installations of Samba may set the default to hash2.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>mangling method = hash</B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>mangling method = hash2</B
+></P
+></DD
+><DT
+><A
 NAME="MAPARCHIVE"
 ></A
 >map archive (S)</DT
@@ -14227,7 +14400,7 @@ CLASS="COMMAND"
 ></P
 ><P
 >See the section on <A
-HREF="#AEN202"
+HREF="#AEN203"
 >NAME 
 		MANGLING</A
 > for a fuller discussion.</P
@@ -15869,7 +16042,7 @@ CLASS="PARAMETER"
 		be used in granting access.</P
 ><P
 >See also the section <A
-HREF="#AEN235"
+HREF="#AEN241"
 >		NOTE ABOUT USERNAME/PASSWORD VALIDATION</A
 >.</P
 ><P
@@ -15950,7 +16123,7 @@ CLASS="PARAMETER"
 > parameter for details on doing this.</P
 ><P
 >See also the section <A
-HREF="#AEN235"
+HREF="#AEN241"
 >		NOTE ABOUT USERNAME/PASSWORD VALIDATION</A
 >.</P
 ><P
@@ -16026,7 +16199,7 @@ CLASS="PARAMETER"
 > parameter for details on doing this.</P
 ><P
 >See also the section <A
-HREF="#AEN235"
+HREF="#AEN241"
 >		NOTE ABOUT USERNAME/PASSWORD VALIDATION</A
 >.</P
 ><P
@@ -16141,7 +16314,7 @@ CLASS="COMMAND"
 		Domain Controller. This issue will be addressed in a future release.</P
 ><P
 >See also the section <A
-HREF="#AEN235"
+HREF="#AEN241"
 >		NOTE ABOUT USERNAME/PASSWORD VALIDATION</A
 >.</P
 ><P
@@ -16405,7 +16578,7 @@ CLASS="COMMAND"
 		names are lowered. </P
 ><P
 >See the section on <A
-HREF="#AEN202"
+HREF="#AEN203"
 >		NAME MANGLING</A
 >.</P
 ><P
@@ -17497,9 +17670,11 @@ NAME="STRIPDOT"
 >strip dot (G)</DT
 ><DD
 ><P
->This is a boolean that controls whether to 
-		strip trailing dots off UNIX filenames. This helps with some 
-		CDROMs that have filenames ending in a single dot.</P
+>This parameter is now unused in Samba (2.2.5 and above).
+		It used strip trailing dots off UNIX filenames but was not correctly implmented.
+		In Samba 2.2.5 and above UNIX filenames ending in a dot are invalid Windows long
+		filenames (as they are in Windows NT and above) and are mangled to 8.3 before
+		being returned to a client.</P
 ><P
 >Default: <B
 CLASS="COMMAND"
@@ -18114,7 +18289,7 @@ CLASS="PARAMETER"
 		search.</P
 ><P
 >See the section <A
-HREF="#AEN235"
+HREF="#AEN241"
 >NOTE ABOUT 
 		USERNAME/PASSWORD VALIDATION</A
 > for more information on how 
@@ -19019,24 +19194,32 @@ CLASS="COMMAND"
 ></P
 ></DD
 ><DT
-><A
+>winbind use default domain, <A
 NAME="WINBINDUSEDEFAULTDOMAIN"
 ></A
->winbind use default domain (G)</DT
+>winbind use default domain</DT
 ><DD
 ><P
->This option controls whether or not smbd
-		should lookup 'username' as 'DOMAIN\username' when winbindd is
-		running on a system.  This is most useful when used in conjunction
-		with pam_winbind.so to prevent a Windows user from having to enter
-		commands like "ssh 'DOMAIN\username@hostname'".  This option is disabled 
-		by default, thus requiring that the DOMAIN\username format be used.</P
+>This parameter specifies whether the <A
+HREF="winbindd.8.html"
+TARGET="_top"
+>		winbindd(8)</A
+>
+		daemon should operate on users without domain component in their username.  
+                Users without a domain component are treated as is part of the winbindd server's 
+                own domain.  While this does not benifit Windows users, it makes SSH, FTP and e-mail 
+                function in a way much closer to the way they would in a native unix system.</P
 ><P
 >Default: <B
 CLASS="COMMAND"
->winbind use default domain = no</B
->
-		</P
+>winbind use default domain = &#60;falseg&#62; 
+		</B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>winbind use default domain = true</B
+></P
 ></DD
 ><DT
 ><A
@@ -19407,7 +19590,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6134"
+NAME="AEN6192"
 ></A
 ><H2
 >WARNINGS</H2
@@ -19437,7 +19620,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6140"
+NAME="AEN6198"
 ></A
 ><H2
 >VERSION</H2
@@ -19448,7 +19631,7 @@ NAME="AEN6140"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6143"
+NAME="AEN6201"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -19527,7 +19710,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6163"
+NAME="AEN6221"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbcontrol.1.html b/docs/htmldocs/smbcontrol.1.html
index 5dc9854a848..8e0f326125f 100644
--- a/docs/htmldocs/smbcontrol.1.html
+++ b/docs/htmldocs/smbcontrol.1.html
@@ -36,17 +36,17 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbcontrol</B
->  [-i]</P
+>  [-d &#60;debug level&#62;] [-s &#60;smb config file&#62;] {-i}</P
 ><P
 ><B
 CLASS="COMMAND"
 >smbcontrol</B
->  [destination] [message-type] [parameter]</P
+>  [-d &#60;debug level&#62;] [-s &#60;smb config file&#62;] {destination} {message-type} [parameter]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17"
+NAME="AEN21"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -81,7 +81,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26"
+NAME="AEN30"
 ></A
 ><H2
 >OPTIONS</H2
@@ -91,6 +91,24 @@ NAME="AEN26"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
+>-d &#60;debuglevel&#62;</DT
+><DD
+><P
+>debuglevel is an integer from 0 to 10.</P
+></DD
+><DT
+>-s &#60;smb.conf&#62;</DT
+><DD
+><P
+>This parameter specifies the pathname to
+		the Samba configuration file, <A
+HREF="smb.conf.5.html"
+TARGET="_top"
+>		smb.conf(5)</A
+>.  This file controls all aspects of
+		the Samba setup on the machine.</P
+></DD
+><DT
 >-i</DT
 ><DD
 ><P
@@ -268,7 +286,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN81"
+NAME="AEN94"
 ></A
 ><H2
 >VERSION</H2
@@ -279,7 +297,7 @@ NAME="AEN81"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN84"
+NAME="AEN97"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -305,7 +323,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN91"
+NAME="AEN104"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbpasswd.5.html b/docs/htmldocs/smbpasswd.5.html
index 1f862b66114..229350542e6 100644
--- a/docs/htmldocs/smbpasswd.5.html
+++ b/docs/htmldocs/smbpasswd.5.html
@@ -72,7 +72,7 @@ CLASS="FILENAME"
 >passwd(5)</TT
 > 
 	file. It is an ASCII file containing one line for each user. Each field 
-	ithin each line is separated from the next by a colon. Any entry 
+	within each line is separated from the next by a colon. Any entry 
 	beginning with '#' is ignored. The smbpasswd file contains the 
 	following information for each user: </P
 ><P
diff --git a/docs/htmldocs/smbpasswd.8.html b/docs/htmldocs/smbpasswd.8.html
index 6bff986f751..90f9ca076c5 100644
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.8.html
@@ -156,22 +156,6 @@ CLASS="COMMAND"
 >. </P
 ></DD
 ><DT
->-s</DT
-><DD
-><P
->This option causes smbpasswd to be silent (i.e. 
-		not issue prompts) and to read its old and new passwords from 
-		standard  input, rather than from <TT
-CLASS="FILENAME"
->/dev/tty</TT
-> 
-		(like the <B
-CLASS="COMMAND"
->passwd(1)</B
-> program does). This option 
-		is to aid people writing scripts to drive smbpasswd</P
-></DD
-><DT
 >-c smb.conf file</DT
 ><DD
 ><P
@@ -249,6 +233,59 @@ CLASS="PARAMETER"
 		specifying a Win95/98  machine as remote machine target. </P
 ></DD
 ><DT
+>-s</DT
+><DD
+><P
+>This option causes smbpasswd to be silent (i.e. 
+		not issue prompts) and to read its old and new passwords from 
+		standard  input, rather than from <TT
+CLASS="FILENAME"
+>/dev/tty</TT
+> 
+		(like the <B
+CLASS="COMMAND"
+>passwd(1)</B
+> program does). This option 
+		is to aid people writing scripts to drive smbpasswd</P
+></DD
+><DT
+>-S</DT
+><DD
+><P
+>This option causes <B
+CLASS="COMMAND"
+>smbpasswd</B
+>
+		to query a domain controller of the domain specified 
+		by the <A
+HREF="smb.conf.5.html#WORKGROUP"
+TARGET="_top"
+>workgroup</A
+>
+		parameter in <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> and store the
+		domain SID in the <TT
+CLASS="FILENAME"
+>secrets.tdb</TT
+> file
+		as its own machine SID.  This is only useful when configuring
+		a Samba PDC and Samba BDC, or when migrating from a Windows PDC
+		to a Samba PDC.  </P
+><P
+>The <TT
+CLASS="PARAMETER"
+><I
+>-r</I
+></TT
+> options can be used
+		as well to indicate a specific domain controller which should
+		be contacted.  In this case, the domain SID obtained is the 
+		one for the domain to which the remote machine belongs.
+		</P
+></DD
+><DT
 >-U username[%pass]</DT
 ><DD
 ><P
@@ -422,7 +459,7 @@ CLASS="PARAMETER"
 >ldap
 		admin dn</I
 ></TT
-> ever changes, the password will beed to be 
+> ever changes, the password will need to be 
 		manually updated as well.
 		</P
 ></DD
@@ -623,7 +660,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN195"
+NAME="AEN205"
 ></A
 ><H2
 >NOTES</H2
@@ -666,7 +703,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN205"
+NAME="AEN215"
 ></A
 ><H2
 >VERSION</H2
@@ -677,7 +714,7 @@ NAME="AEN205"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN208"
+NAME="AEN218"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -700,7 +737,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN214"
+NAME="AEN224"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/winbind.html b/docs/htmldocs/winbind.html
index fb83d37a155..8a41808700b 100644
--- a/docs/htmldocs/winbind.html
+++ b/docs/htmldocs/winbind.html
@@ -410,12 +410,20 @@ for providing the HOWTO for this section.</P
 >This HOWTO describes how to get winbind services up and running 
 to control access and authenticate users on your Linux box using 
 the winbind services which come with SAMBA 2.2.2.</P
+><P
+>There is also some Solaris specific information in 
+<TT
+CLASS="FILENAME"
+>docs/textdocs/Solaris-Winbind-HOWTO.txt</TT
+>.
+Future revisions of this document will incorporate that
+information.</P
 ><DIV
 CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN76"
+NAME="AEN78"
 >Introduction</A
 ></H2
 ><P
@@ -468,7 +476,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN89"
+NAME="AEN91"
 >Requirements</A
 ></H2
 ><P
@@ -529,7 +537,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN103"
+NAME="AEN105"
 >Testing Things Out</A
 ></H2
 ><P
@@ -574,7 +582,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN114"
+NAME="AEN116"
 >Configure and compile SAMBA</A
 ></H3
 ><P
@@ -640,7 +648,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN133"
+NAME="AEN135"
 >Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -721,7 +729,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN158"
+NAME="AEN160"
 >Configure smb.conf</A
 ></H3
 ><P
@@ -796,7 +804,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN174"
+NAME="AEN176"
 >Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
@@ -842,7 +850,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN185"
+NAME="AEN187"
 >Start up the winbindd daemon and test it!</A
 ></H3
 ><P
@@ -965,7 +973,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN221"
+NAME="AEN223"
 >Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -1077,7 +1085,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN243"
+NAME="AEN245"
 >Configure Winbind and PAM</A
 ></H3
 ><P
@@ -1254,7 +1262,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN290"
+NAME="AEN292"
 >Limitations</A
 ></H1
 ><P
@@ -1295,7 +1303,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN300"
+NAME="AEN302"
 >Conclusion</A
 ></H1
 ><P
-- 
cgit