updated the 3.0 branch from the head branch - ready for alpha18

(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)

11 files changed, 998 insertions, 237 deletions

diff --git a/docs/htmldocs/Samba-HOWTO-Collection.html b/docs/htmldocs/Samba-HOWTO-Collection.html
index 5b44d17968..5175bd4c8d 100644
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
@@ -878,29 +878,29 @@ HREF="#AEN2015"
 ><DL
 ><DT
 >11.5.1. <A
-HREF="#AEN2020"
+HREF="#AEN2022"
 >Introduction</A
 ></DT
 ><DT
 >11.5.2. <A
-HREF="#AEN2033"
+HREF="#AEN2035"
 >Requirements</A
 ></DT
 ><DT
 >11.5.3. <A
-HREF="#AEN2047"
+HREF="#AEN2049"
 >Testing Things Out</A
 ></DT
 ><DD
 ><DL
 ><DT
 >11.5.3.1. <A
-HREF="#AEN2058"
+HREF="#AEN2060"
 >Configure and compile SAMBA</A
 ></DT
 ><DT
 >11.5.3.2. <A
-HREF="#AEN2077"
+HREF="#AEN2079"
 >Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -909,22 +909,22 @@ winbind libraries</A
 ></DT
 ><DT
 >11.5.3.3. <A
-HREF="#AEN2102"
+HREF="#AEN2104"
 >Configure smb.conf</A
 ></DT
 ><DT
 >11.5.3.4. <A
-HREF="#AEN2118"
+HREF="#AEN2120"
 >Join the SAMBA server to the PDC domain</A
 ></DT
 ><DT
 >11.5.3.5. <A
-HREF="#AEN2129"
+HREF="#AEN2131"
 >Start up the winbindd daemon and test it!</A
 ></DT
 ><DT
 >11.5.3.6. <A
-HREF="#AEN2165"
+HREF="#AEN2167"
 >Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -932,7 +932,7 @@ CLASS="FILENAME"
 ></DT
 ><DT
 >11.5.3.7. <A
-HREF="#AEN2187"
+HREF="#AEN2189"
 >Configure Winbind and PAM</A
 ></DT
 ></DL
@@ -941,12 +941,12 @@ HREF="#AEN2187"
 ></DD
 ><DT
 >11.6. <A
-HREF="#AEN2234"
+HREF="#AEN2236"
 >Limitations</A
 ></DT
 ><DT
 >11.7. <A
-HREF="#AEN2244"
+HREF="#AEN2246"
 >Conclusion</A
 ></DT
 ></DL
@@ -960,32 +960,32 @@ HREF="#OS2"
 ><DL
 ><DT
 >12.1. <A
-HREF="#AEN2258"
+HREF="#AEN2260"
 >FAQs</A
 ></DT
 ><DD
 ><DL
 ><DT
 >12.1.1. <A
-HREF="#AEN2260"
+HREF="#AEN2262"
 >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="#AEN2275"
+HREF="#AEN2277"
 >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="#AEN2284"
+HREF="#AEN2286"
 >Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></DT
 ><DT
 >12.1.4. <A
-HREF="#AEN2288"
+HREF="#AEN2290"
 >How do I get printer driver download working 
 		for OS/2 clients?</A
 ></DT
@@ -1002,24 +1002,24 @@ HREF="#CVS-ACCESS"
 ><DL
 ><DT
 >13.1. <A
-HREF="#AEN2304"
+HREF="#AEN2306"
 >Introduction</A
 ></DT
 ><DT
 >13.2. <A
-HREF="#AEN2309"
+HREF="#AEN2311"
 >CVS Access to samba.org</A
 ></DT
 ><DD
 ><DL
 ><DT
 >13.2.1. <A
-HREF="#AEN2312"
+HREF="#AEN2314"
 >Access via CVSweb</A
 ></DT
 ><DT
 >13.2.2. <A
-HREF="#AEN2317"
+HREF="#AEN2319"
 >Access via cvs</A
 ></DT
 ></DL
@@ -1028,7 +1028,7 @@ HREF="#AEN2317"
 ></DD
 ><DT
 ><A
-HREF="#AEN2345"
+HREF="#AEN2347"
 >Index</A
 ></DT
 ></DL
@@ -8347,7 +8347,7 @@ Identified (RID).</P
 >As a result of these defeciencies, a more robust means of storing user attributes
 used by smbd was developed.  The API which defines access to user accounts
 is commonly referred to as the samdb interface (previously this was called the passdb
-API, and is still so named in the CVS trees).  In Samba 2.2.3, enabling support
+API, and is still so named in the CVS trees). In Samba 2.2.3, enabling support
 for a samdb backend (e.g. <TT
 CLASS="PARAMETER"
 ><I
@@ -9535,12 +9535,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="AEN2020"
+NAME="AEN2022"
 >11.5.1. Introduction</A
 ></H2
 ><P
@@ -9591,7 +9599,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2033"
+NAME="AEN2035"
 >11.5.2. Requirements</A
 ></H2
 ><P
@@ -9649,7 +9657,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2047"
+NAME="AEN2049"
 >11.5.3. Testing Things Out</A
 ></H2
 ><P
@@ -9694,7 +9702,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2058"
+NAME="AEN2060"
 >11.5.3.1. Configure and compile SAMBA</A
 ></H3
 ><P
@@ -9769,7 +9777,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2077"
+NAME="AEN2079"
 >11.5.3.2. Configure <TT
 CLASS="FILENAME"
 >nsswitch.conf</TT
@@ -9859,7 +9867,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2102"
+NAME="AEN2104"
 >11.5.3.3. Configure smb.conf</A
 ></H3
 ><P
@@ -9943,7 +9951,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2118"
+NAME="AEN2120"
 >11.5.3.4. Join the SAMBA server to the PDC domain</A
 ></H3
 ><P
@@ -9989,7 +9997,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2129"
+NAME="AEN2131"
 >11.5.3.5. Start up the winbindd daemon and test it!</A
 ></H3
 ><P
@@ -10130,7 +10138,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2165"
+NAME="AEN2167"
 >11.5.3.6. Fix the <TT
 CLASS="FILENAME"
 >/etc/rc.d/init.d/smb</TT
@@ -10260,7 +10268,7 @@ CLASS="SECT3"
 ><HR><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2187"
+NAME="AEN2189"
 >11.5.3.7. Configure Winbind and PAM</A
 ></H3
 ><P
@@ -10482,7 +10490,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2234"
+NAME="AEN2236"
 >11.6. Limitations</A
 ></H1
 ><P
@@ -10523,7 +10531,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2244"
+NAME="AEN2246"
 >11.7. Conclusion</A
 ></H1
 ><P
@@ -10547,7 +10555,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2258"
+NAME="AEN2260"
 >12.1. FAQs</A
 ></H1
 ><DIV
@@ -10555,7 +10563,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2260"
+NAME="AEN2262"
 >12.1.1. How can I configure OS/2 Warp Connect or 
 		OS/2 Warp 4 as a client for Samba?</A
 ></H2
@@ -10614,7 +10622,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2275"
+NAME="AEN2277"
 >12.1.2. How can I configure OS/2 Warp 3 (not Connect), 
 		OS/2 1.2, 1.3 or 2.x for Samba?</A
 ></H2
@@ -10667,7 +10675,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2284"
+NAME="AEN2286"
 >12.1.3. Are there any other issues when OS/2 (any version) 
 		is used as a client?</A
 ></H2
@@ -10689,7 +10697,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2288"
+NAME="AEN2290"
 >12.1.4. How do I get printer driver download working 
 		for OS/2 clients?</A
 ></H2
@@ -10745,7 +10753,7 @@ CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2304"
+NAME="AEN2306"
 >13.1. Introduction</A
 ></H1
 ><P
@@ -10767,7 +10775,7 @@ CLASS="SECT1"
 ><HR><H1
 CLASS="SECT1"
 ><A
-NAME="AEN2309"
+NAME="AEN2311"
 >13.2. CVS Access to samba.org</A
 ></H1
 ><P
@@ -10780,7 +10788,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2312"
+NAME="AEN2314"
 >13.2.1. Access via CVSweb</A
 ></H2
 ><P
@@ -10801,7 +10809,7 @@ CLASS="SECT2"
 ><HR><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2317"
+NAME="AEN2319"
 >13.2.2. Access via cvs</A
 ></H2
 ><P
@@ -10907,7 +10915,7 @@ CLASS="COMMAND"
 ></DIV
 ><HR><H1
 ><A
-NAME="AEN2345"
+NAME="AEN2347"
 >Index</A
 ></H1
 ><DL
diff --git a/docs/htmldocs/nmbd.8.html b/docs/htmldocs/nmbd.8.html
index 4e5993f3bc..76fd5de6ba 100644
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@@ -295,9 +295,7 @@ CLASS="FILENAME"
 		<B
 CLASS="COMMAND"
 >nmbd</B
-> server.</P
-><P
->The default log directory is compiled into Samba
+> server. The default log directory is compiled into Samba
 		as part of the build process. Common defaults are <TT
 CLASS="FILENAME"
 >		/usr/local/samba/var/log.nmb</TT
@@ -308,7 +306,15 @@ CLASS="FILENAME"
 		<TT
 CLASS="FILENAME"
 >/var/log/log.nmb</TT
->.</P
+>.  <EM
+>Beware:</EM
+>
+                If the directory specified does not exist, <B
+CLASS="COMMAND"
+>nmbd</B
+>
+                will log to the default debug log location defined at compile time.
+		</P
 ></DD
 ><DT
 >-n &#60;primary NetBIOS name&#62;</DT
@@ -340,31 +346,30 @@ CLASS="FILENAME"
 ><DD
 ><P
 >UDP port number is a positive integer value.
-		This option changes the default UDP port number (normally 137) 
+		This option changes the default UDP port number (normally 137)
 		that <B
 CLASS="COMMAND"
 >nmbd</B
-> responds to name queries on. Don't 
-		use this option unless you are an expert, in which case you 
+> responds to name queries on. Don't
+		use this option unless you are an expert, in which case you
 		won't need help!</P
 ></DD
 ><DT
 >-s &#60;configuration file&#62;</DT
 ><DD
 ><P
->The default configuration file name 
+>The default configuration file name
 		is set at build time, typically as <TT
 CLASS="FILENAME"
 >		/usr/local/samba/lib/smb.conf</TT
 >, but
 		this may be changed when Samba is autoconfigured.</P
 ><P
->The file specified contains the configuration details 
+>The file specified contains the configuration details
 		required by the server. See <A
 HREF="smb.conf.5.html"
 TARGET="_top"
-> 
-		<TT
+>		<TT
 CLASS="FILENAME"
 >smb.conf(5)</TT
 ></A
@@ -377,7 +382,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN130"
+NAME="AEN131"
 ></A
 ><H2
 >FILES</H2
@@ -393,12 +398,12 @@ CLASS="FILENAME"
 ></DT
 ><DD
 ><P
->If the server is to be run by the 
+>If the server is to be run by the
 		<B
 CLASS="COMMAND"
 >inetd</B
-> meta-daemon, this file 
-		must contain suitable startup information for the 
+> meta-daemon, this file
+		must contain suitable startup information for the
 		meta-daemon. See the <A
 HREF="UNIX_INSTALL.html"
 TARGET="_top"
@@ -414,11 +419,11 @@ CLASS="FILENAME"
 ></DT
 ><DD
 ><P
->or whatever initialization script your 
+>or whatever initialization script your
 		system uses).</P
 ><P
->If running the server as a daemon at startup, 
-		this file will need to contain an appropriate startup 
+>If running the server as a daemon at startup,
+		this file will need to contain an appropriate startup
 		sequence for the server. See the <A
 HREF="UNIX_INSTALL.html"
 TARGET="_top"
@@ -433,13 +438,13 @@ CLASS="FILENAME"
 ></DT
 ><DD
 ><P
->If running the server via the 
+>If running the server via the
 		meta-daemon <B
 CLASS="COMMAND"
 >inetd</B
->, this file 
-		must contain a mapping of service name (e.g., netbios-ssn) 
-		to service port (e.g., 139) and protocol type (e.g., tcp). 
+>, this file
+		must contain a mapping of service name (e.g., netbios-ssn)
+		to service port (e.g., 139) and protocol type (e.g., tcp).
 		See the <A
 HREF="UNIX_INSTALL.html"
 TARGET="_top"
@@ -454,7 +459,7 @@ CLASS="FILENAME"
 ></DT
 ><DD
 ><P
->This is the default location of the 
+>This is the default location of the
 		<A
 HREF="smb.conf.5.html"
 TARGET="_top"
@@ -463,17 +468,17 @@ CLASS="FILENAME"
 >smb.conf</TT
 ></A
 >
-		server configuration file. Other common places that systems 
+		server configuration file. Other common places that systems
 		install this file are <TT
 CLASS="FILENAME"
 >/usr/samba/lib/smb.conf</TT
-> 
+>
 		and <TT
 CLASS="FILENAME"
 >/etc/smb.conf</TT
 >.</P
 ><P
->When run as a WINS server (see the 
+>When run as a WINS server (see the
 		<A
 HREF="smb.conf.5.html#WINSSUPPORT"
 TARGET="_top"
@@ -490,11 +495,11 @@ CLASS="COMMAND"
 		will store the WINS database in the file <TT
 CLASS="FILENAME"
 >wins.dat</TT
-> 
+>
 		in the <TT
 CLASS="FILENAME"
 >var/locks</TT
-> directory configured under 
+> directory configured under
 		wherever Samba was configured to install itself.</P
 ><P
 >If <B
@@ -532,7 +537,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN177"
+NAME="AEN178"
 ></A
 ><H2
 >SIGNALS</H2
@@ -540,21 +545,21 @@ NAME="AEN177"
 >To shut down an <B
 CLASS="COMMAND"
 >nmbd</B
-> process it is recommended 
+> process it is recommended
 	that SIGKILL (-9) <EM
 >NOT</EM
-> be used, except as a last 
-	resort, as this may leave the name database in an inconsistent state. 
+> be used, except as a last
+	resort, as this may leave the name database in an inconsistent state.
 	The correct way to terminate <B
 CLASS="COMMAND"
 >nmbd</B
-> is to send it 
+> is to send it
 	a SIGTERM (-15) signal and wait for it to die on its own.</P
 ><P
 ><B
 CLASS="COMMAND"
 >nmbd</B
-> will accept SIGHUP, which will cause 
+> will accept SIGHUP, which will cause
 	it to dump out its namelists into the file <TT
 CLASS="FILENAME"
 >namelist.debug
@@ -562,12 +567,12 @@ CLASS="FILENAME"
 > in the <TT
 CLASS="FILENAME"
 >/usr/local/samba/var/locks</TT
-> 
+>
 	directory (or the <TT
 CLASS="FILENAME"
 >var/locks</TT
-> directory configured 
-	under wherever Samba was configured to install itself). This will also 
+> directory configured
+	under wherever Samba was configured to install itself). This will also
 	cause <B
 CLASS="COMMAND"
 >nmbd</B
@@ -593,7 +598,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN193"
+NAME="AEN194"
 ></A
 ><H2
 >VERSION</H2
@@ -604,7 +609,7 @@ NAME="AEN193"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN196"
+NAME="AEN197"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -669,7 +674,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN213"
+NAME="AEN214"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/pdbedit.8.html b/docs/htmldocs/pdbedit.8.html
index 9609664af0..b1a1dea679 100644
--- a/docs/htmldocs/pdbedit.8.html
+++ b/docs/htmldocs/pdbedit.8.html
@@ -36,12 +36,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >pdbedit</B
->  [-l] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-d drive] [-s script] [-p profile] [-a] [-m] [-x] [-i file]</P
+>  [-l] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-d drive] [-s script] [-p profile] [-a] [-m] [-x] [-i passdb-backend] [-e passdb-backend] [-D debuglevel]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24"
+NAME="AEN26"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -67,7 +67,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN31"
+NAME="AEN33"
 ></A
 ><H2
 >OPTIONS</H2
@@ -337,29 +337,40 @@ CLASS="COMMAND"
 ></P
 ></DD
 ><DT
->-i file</DT
+>-i passdb-backend</DT
 ><DD
 ><P
->This command is used to import a smbpasswd
-		file into the database.</P
+>Use a different passdb backend to retrieve users than the one specified in smb.conf.</P
 ><P
->This option will ease migration from the plain smbpasswd
-		file database to more powerful backend databases like tdb and
-		ldap.</P
+>This option will ease migration from one passdb backend to another.
+		</P
 ><P
 >Example: <B
 CLASS="COMMAND"
->pdbedit -i /etc/smbpasswd.old</B
+>pdbedit -i smbpasswd:/etc/smbpasswd.old -e tdbsam:/etc/samba/passwd.tdb</B
 >
 		</P
 ></DD
+><DT
+>-e passdb-backend</DT
+><DD
+><P
+>Export all currently available users to the specified password database backend.</P
+><P
+>This option will ease migration from one passdb backend to another and will ease backupping</P
+><P
+>Example: <B
+CLASS="COMMAND"
+>pdbedit -e smbpasswd:/root/samba-users.backup</B
+></P
+></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN124"
+NAME="AEN133"
 ></A
 ><H2
 >NOTES</H2
@@ -369,7 +380,7 @@ NAME="AEN124"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN127"
+NAME="AEN136"
 ></A
 ><H2
 >VERSION</H2
@@ -380,7 +391,7 @@ NAME="AEN127"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN130"
+NAME="AEN139"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -400,7 +411,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN135"
+NAME="AEN144"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index 91161af142..d329c25d65 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -89,7 +89,7 @@ CLASS="REPLACEABLE"
 >Section and parameter names are not case sensitive.</P
 ><P
 >Only the first equals sign in a parameter is significant. 
-	Whitespace before or after the first equals sign is discarded. 
+	Whitespace before or after the first equals sign is discarded.
 	Leading, trailing and internal whitespace in section and parameter 
 	names is irrelevant. Leading and trailing whitespace in a parameter 
 	value is discarded. Internal whitespace within a parameter value 
@@ -140,7 +140,7 @@ NAME="AEN28"
 ><P
 >Sections may be designated <EM
 >guest</EM
-> services, 
+> services,
 	in which case no password is required to access them. A specified 
 	UNIX <EM
 >guest account</EM
@@ -632,7 +632,7 @@ CLASS="VARIABLELIST"
 >%d</DT
 ><DD
 ><P
->The process id of the current server 
+>The process id of the current server
 		process.</P
 ></DD
 ><DT
@@ -756,7 +756,7 @@ CLASS="VARIABLELIST"
 >short preserve case = yes/no</DT
 ><DD
 ><P
->controls if new files which conform to 8.3 syntax, 
+>controls if new files which conform to 8.3 syntax,
 		that is all in upper case and of suitable length, are created 
 		upper case, or if they are forced to be the "default" 
 		case. This option can be use with "preserve case = yes" 
@@ -785,8 +785,9 @@ NAME="AEN236"
 	steps fail, then the connection request is rejected.  However, if one of the 
 	steps succeeds, then the following steps are not checked.</P
 ><P
->If the service is marked "guest only = yes" then
-	steps 1 to 5 are skipped.</P
+>If the service is marked "guest only = yes" and the
+	server is running with share-level security ("security = share")
+	then steps 1 to 5 are skipped.</P
 ><P
 ></P
 ><OL
@@ -924,6 +925,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#ALGORITHMICRIDBASE"
+><TT
+CLASS="PARAMETER"
+><I
+>algorithmic rid base</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#ALLOWTRUSTEDDOMAINS"
 ><TT
 CLASS="PARAMETER"
@@ -1572,6 +1585,42 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#LOCKSPINCOUNT"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin count</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#LOCKSPINTIME"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin time</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
+HREF="#PIDDIRECTORY"
+><TT
+CLASS="PARAMETER"
+><I
+>pid directory</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#LOGFILE"
 ><TT
 CLASS="PARAMETER"
@@ -1944,6 +1993,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#NTSTATUSSUPPORT"
+><TT
+CLASS="PARAMETER"
+><I
+>nt status support</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#NULLPASSWORDS"
 ><TT
 CLASS="PARAMETER"
@@ -3002,7 +3063,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN971"
+NAME="AEN991"
 ></A
 ><H2
 >COMPLETE LIST OF SERVICE PARAMETERS</H2
@@ -3159,6 +3220,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#CSCPOLICY"
+><TT
+CLASS="PARAMETER"
+><I
+>csc policy</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#DEFAULTCASE"
 ><TT
 CLASS="PARAMETER"
@@ -3555,6 +3628,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#INHERITACLS"
+><TT
+CLASS="PARAMETER"
+><I
+>inherit acls</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#INHERITPERMISSIONS"
 ><TT
 CLASS="PARAMETER"
@@ -4179,6 +4264,18 @@ CLASS="PARAMETER"
 ><LI
 ><P
 ><A
+HREF="#SHAREMODES"
+><TT
+CLASS="PARAMETER"
+><I
+>share modes</I
+></TT
+></A
+></P
+></LI
+><LI
+><P
+><A
 HREF="#SHORTPRESERVECASE"
 ><TT
 CLASS="PARAMETER"
@@ -4445,7 +4542,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN1451"
+NAME="AEN1483"
 ></A
 ><H2
 >EXPLANATION OF EACH PARAMETER</H2
@@ -5019,6 +5116,38 @@ CLASS="PARAMETER"
 ></DD
 ><DT
 ><A
+NAME="ALGORITHMICRIDBASE"
+></A
+>algorithmic rid base (G)</DT
+><DD
+><P
+>This determines how Samba will use its
+                algorithmic mapping from uids/gid to the RIDs needed to construct
+                NT Security Identifiers.</P
+><P
+>Setting this option to a larger value could be useful to sites
+                transitioning from WinNT and Win2k, as existing user and 
+                group rids would otherwise clash with sytem users etc. 
+                </P
+><P
+>All UIDs and GIDs must be able to be resolved into SIDs for  
+                the correct operation of ACLs on the server.  As such the algorithmic
+                mapping can't be 'turned off', but pushing it 'out of the way' should
+                resolve the issues.  Users and groups can then be assigned 'low' RIDs
+                in arbitary-rid supporting backends. </P
+><P
+>Default: <B
+CLASS="COMMAND"
+>algorithmic rid base = 1000</B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>algorithmic rid base = 100000</B
+></P
+></DD
+><DT
+><A
 NAME="ALLOWTRUSTEDDOMAINS"
 ></A
 >allow trusted domains (G)</DT
@@ -5927,6 +6056,40 @@ CLASS="PARAMETER"
 ></DD
 ><DT
 ><A
+NAME="CSCPOLICY"
+></A
+>csc policy (S)</DT
+><DD
+><P
+>This stands for <EM
+>client-side caching 
+		policy</EM
+>, and specifies how clients capable of offline
+		caching will cache the files in the share. The valid values
+		are: manual, documents, programs, disable.</P
+><P
+>These values correspond to those used on Windows
+		servers.</P
+><P
+>For example, shares containing roaming profiles can have
+		offline caching disabled using <B
+CLASS="COMMAND"
+>csc policy = disable
+		</B
+>.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>csc policy = manual</B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>csc policy = programs</B
+></P
+></DD
+><DT
+><A
 NAME="DEADTIME"
 ></A
 >deadtime (G)</DT
@@ -8813,6 +8976,28 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="INHERITACLS"
+></A
+>inherit acls (S)</DT
+><DD
+><P
+>This parameter can be used to ensure
+		that if default acls exist on parent directories,
+		they are always honored when creating a subdirectory.
+		The default behavior is to use the mode specified
+		when creating the directory.  Enabling this option
+		sets the mode to 0777, thus guaranteeing that 
+		default directory acls are propagated.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>inherit acls = no</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="INHERITPERMISSIONS"
 ></A
 >inherit permissions (S)</DT
@@ -9831,6 +10016,56 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="LOCKSPINCOUNT"
+></A
+>lock spin count (G)</DT
+><DD
+><P
+>This parameter controls the number of times
+		that smbd should attempt to gain a byte range lock on the 
+		behalf of a client request.  Experiments have shown that
+		Windows 2k servers do not reply with a failure if the lock
+		could not be immediately granted, but try a few more times
+		in case the lock could later be aquired.  This behavior
+		is used to support PC database formats such as MS Access
+		and FoxPro.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>lock spin count = 2</B
+>
+		</P
+></DD
+><DT
+><A
+NAME="LOCKSPINTIME"
+></A
+>lock spin time (G)</DT
+><DD
+><P
+>The time in microseconds that smbd should 
+		pause before attempting to gain a failed lock.  See
+		<A
+HREF="#LOCKSPINCOUNT"
+><TT
+CLASS="PARAMETER"
+><I
+>lock spin 
+		count</I
+></TT
+></A
+> for more details.
+		</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>lock spin time = 10</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="LOCKING"
 ></A
 >locking (S)</DT
@@ -10360,8 +10595,8 @@ CLASS="COMMAND"
 		takes a printer name as its only parameter and outputs printer 
 		status information.</P
 ><P
->Currently eight styles of printer status information 
-		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX and SOFTQ. 
+>Currently nine styles of printer status information 
+		are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX, CUPS, and SOFTQ. 
 		This covers most UNIX systems. You control which type is expected 
 		using the <TT
 CLASS="PARAMETER"
@@ -10395,7 +10630,15 @@ CLASS="PARAMETER"
 CLASS="ENVAR"
 >$PATH
 		</TT
-> may not be available to the server.</P
+> may not be available to the server.  When compiled with
+		the CUPS libraries, no <TT
+CLASS="PARAMETER"
+><I
+>lpq command</I
+></TT
+> is
+		needed because smbd will make a library call to obtain the 
+		print queue listing.</P
 ><P
 >See also the <A
 HREF="#PRINTING"
@@ -12230,6 +12473,34 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="NTSTATUSSUPPORT"
+></A
+>nt status support (G)</DT
+><DD
+><P
+>This boolean parameter controls whether <A
+HREF="smbd.8.html"
+TARGET="_top"
+>smbd(8)</A
+> will negotiate NT specific status
+		support with Windows NT/2k/XP clients. This is a developer
+		debugging option and should be left alone.
+	 	If this option is set to <TT
+CLASS="CONSTANT"
+>no</TT
+> then Samba offers
+		exactly the same DOS error codes that versions prior to Samba 2.2.3
+		reported.</P
+><P
+>You should not need to ever disable this parameter.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>nt status support = yes</B
+></P
+></DD
+><DT
+><A
 NAME="NULLPASSWORDS"
 ></A
 >null passwords (G)</DT
@@ -12655,10 +12926,10 @@ NAME="PASSDBBACKEND"
 >passdb backend (G)</DT
 ><DD
 ><P
->This option allows the administrator to chose what
-                backend in which to store passwords.  This allows (for example) both 
-                smbpasswd and tdbsam to be used without a recompile.  Only one can
-                be used at a time however, and experimental backends must still be selected
+>This option allows the administrator to chose which backends to retrieve and store passwords with. This allows (for example) both 
+                smbpasswd and tdbsam to be used without a recompile. 
+                Multiple backends can be specified, seperated by spaces. The backends will be searched in the order they are specified. New users are always added to the first backend specified.
+                Experimental backends must still be selected
                 (eg --with-tdbsam) at configure time.
 		</P
 ><P
@@ -12798,7 +13069,7 @@ CLASS="COMMAND"
 ><P
 >Example: <B
 CLASS="COMMAND"
->passdb backend = tdbsam:/etc/samba/private/passdb.tdb</B
+>passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd</B
 ></P
 ><P
 >Example: <B
@@ -12808,7 +13079,7 @@ CLASS="COMMAND"
 ><P
 >Example: <B
 CLASS="COMMAND"
->passdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args</B
+>passdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args tdbsam:/etc/samba/private/passdb.tdb</B
 ></P
 ></DD
 ><DT
@@ -13461,6 +13732,27 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="PIDDIRECTORY"
+></A
+>pid directory (G)</DT
+><DD
+><P
+>This option specifies the directory where pid 
+		files will be placed.  </P
+><P
+>Default: <B
+CLASS="COMMAND"
+>pid directory = ${prefix}/var/locks</B
+></P
+><P
+>Example: <B
+CLASS="COMMAND"
+>pid directory = /var/run/</B
+>
+		</P
+></DD
+><DT
+><A
 NAME="POSIXLOCKING"
 ></A
 >posix locking (S)</DT
@@ -13789,34 +14081,23 @@ CLASS="COMMAND"
 		manually remove old spool files.</P
 ><P
 >The print command is simply a text string. It will be used 
-		verbatim, with two exceptions: All occurrences of <TT
-CLASS="PARAMETER"
-><I
->%s
-		</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->%f</I
-></TT
-> will be replaced by the 
-		appropriate spool file name, and all occurrences of <TT
-CLASS="PARAMETER"
-><I
->%p
-		</I
-></TT
-> will be replaced by the appropriate printer name. The 
-		spool file name is generated automatically by the server.  The 
-		<TT
-CLASS="PARAMETER"
-><I
->%J</I
-></TT
-> macro can be used to access the job 
+		verbatim after macro substitutions have been made:</P
+><P
+>s, %p - the path to the spool
+		file name</P
+><P
+>%p - the appropriate printer 
+		name</P
+><P
+>%J - the job 
 		name as transmitted by the client.</P
 ><P
+>%c - The number of printed pages
+		of the spooled job (if known).</P
+><P
+>%z - the size of the spooled
+		print job (in bytes)</P
+><P
 >The print command <EM
 >MUST</EM
 > contain at least 
@@ -13923,6 +14204,25 @@ CLASS="COMMAND"
 >print command = lp -d%p -s %s; rm %s</B
 ></P
 ><P
+>For printing = CUPS :   If SAMBA is compiled against
+		libcups, then <A
+HREF="#PRINTING"
+>printcap = cups</A
+> 
+		uses the CUPS API to
+		submit jobs, etc.  Otherwise it maps to the System V
+		commands with the -oraw option for printing, i.e. it
+		uses <B
+CLASS="COMMAND"
+>lp -c -d%p -oraw; rm %s</B
+>.   
+		With <B
+CLASS="COMMAND"
+>printing = cups</B
+>,
+		and if SAMBA is compiled against libcups, any manually 
+		set print command will be ignored.</P
+><P
 >Example: <B
 CLASS="COMMAND"
 >print command = /usr/local/samba/bin/myprintscript
@@ -14013,6 +14313,23 @@ HREF="#AEN79"
 > section above for reasons 
 		why you might want to do this.</P
 ><P
+>To use the CUPS printing interface set <B
+CLASS="COMMAND"
+>printcap name = cups
+		</B
+>. This should be supplemented by an addtional setting 
+		<A
+HREF="#PRINTING"
+>printing = cups</A
+> in the [global] 
+		section.  <B
+CLASS="COMMAND"
+>printcap name = cups</B
+> will use the  
+		"dummy" printcap created by CUPS, as specified in your CUPS
+		configuration file.
+		</P
+><P
 >On System V systems that use <B
 CLASS="COMMAND"
 >lpstat</B
@@ -15854,6 +16171,64 @@ CLASS="COMMAND"
 ></DD
 ><DT
 ><A
+NAME="SHAREMODES"
+></A
+>share modes (S)</DT
+><DD
+><P
+>This enables or disables the honoring of 
+		the <TT
+CLASS="PARAMETER"
+><I
+>share modes</I
+></TT
+> during a file open. These 
+		modes are used by clients to gain exclusive read or write access 
+		to a file.</P
+><P
+>These open modes are not directly supported by UNIX, so
+		they are simulated using shared memory, or lock files if your 
+		UNIX doesn't support shared memory (almost all do).</P
+><P
+>The share modes that are enabled by this option are 
+		<TT
+CLASS="CONSTANT"
+>DENY_DOS</TT
+>, <TT
+CLASS="CONSTANT"
+>DENY_ALL</TT
+>,
+		<TT
+CLASS="CONSTANT"
+>DENY_READ</TT
+>, <TT
+CLASS="CONSTANT"
+>DENY_WRITE</TT
+>,
+		<TT
+CLASS="CONSTANT"
+>DENY_NONE</TT
+> and <TT
+CLASS="CONSTANT"
+>DENY_FCB</TT
+>.
+		</P
+><P
+>This option gives full share compatibility and enabled 
+		by default.</P
+><P
+>You should <EM
+>NEVER</EM
+> turn this parameter 
+		off as many Windows applications will break if you do so.</P
+><P
+>Default: <B
+CLASS="COMMAND"
+>share modes = yes</B
+></P
+></DD
+><DT
+><A
 NAME="SHORTPRESERVECASE"
 ></A
 >short preserve case (S)</DT
@@ -18258,7 +18633,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDCACHETIME"
 ></A
->winbind cache time</DT
+>winbind cache time (G)</DT
 ><DD
 ><P
 >This parameter specifies the number of seconds the
@@ -18279,8 +18654,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDENUMUSERS"
 ></A
->winbind enum
-		users</DT
+>winbind enum users (G)</DT
 ><DD
 ><P
 >On large installations using
@@ -18331,8 +18705,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDENUMGROUPS"
 ></A
->winbind enum
-		groups</DT
+>winbind enum groups (G)</DT
 ><DD
 ><P
 >On large installations using
@@ -18382,7 +18755,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDGID"
 ></A
->winbind gid</DT
+>winbind gid (G)</DT
 ><DD
 ><P
 >The winbind gid parameter specifies the range of group 
@@ -18409,7 +18782,7 @@ CLASS="COMMAND"
 ><A
 NAME="WINBINDSEPARATOR"
 ></A
->winbind separator</DT
+>winbind separator (G)</DT
 ><DD
 ><P
 >This parameter allows an admin to define the character 
@@ -18439,21 +18812,21 @@ CLASS="FILENAME"
 		with group membership at least on glibc systems, as the character +
 		is used as a special character for NIS in /etc/group.</P
 ><P
->Example: <B
+>Default: <B
 CLASS="COMMAND"
->winbind separator = \\</B
+>winbind separator = '\'</B
 ></P
 ><P
 >Example: <B
 CLASS="COMMAND"
->winbind separator = /</B
+>winbind separator = +</B
 ></P
 ></DD
 ><DT
 ><A
 NAME="WINBINDUID"
 ></A
->winbind uid</DT
+>winbind uid (G)</DT
 ><DD
 ><P
 >The winbind gid parameter specifies the range of group 
@@ -18873,7 +19246,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5974"
+NAME="AEN6101"
 ></A
 ><H2
 >WARNINGS</H2
@@ -18903,7 +19276,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5980"
+NAME="AEN6107"
 ></A
 ><H2
 >VERSION</H2
@@ -18914,7 +19287,7 @@ NAME="AEN5980"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5983"
+NAME="AEN6110"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -18993,7 +19366,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6003"
+NAME="AEN6130"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbclient.1.html b/docs/htmldocs/smbclient.1.html
index 6c15873787..4c770f9eb2 100644
--- a/docs/htmldocs/smbclient.1.html
+++ b/docs/htmldocs/smbclient.1.html
@@ -673,12 +673,12 @@ CLASS="COMMAND"
 >-W WORKGROUP</DT
 ><DD
 ><P
->Override the default workgroup specified in the 
-		workgroup parameter of the <TT
+>Override the default workgroup (domain) specified
+		in the workgroup parameter of the <TT
 CLASS="FILENAME"
 >smb.conf</TT
-> file 
-		for this connection. This may be needed to connect to some 
+>
+		file for this connection. This may be needed to connect to some
 		servers. </P
 ></DD
 ><DT
@@ -1051,6 +1051,42 @@ CLASS="REPLACEABLE"
 		</P
 ></DD
 ><DT
+>altname file</DT
+><DD
+><P
+>The client will request that the server return
+		the "alternate" name (the 8.3 name) for a file or directory.
+		</P
+></DD
+><DT
+>cancel jobid0 [jobid1] ... [jobidN]</DT
+><DD
+><P
+>The client will request that the server cancel
+		the printjobs identified by the given numeric print job ids.
+		</P
+></DD
+><DT
+>chmod file mode in octal</DT
+><DD
+><P
+>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		change the UNIX permissions to the given octal mode, in standard UNIX format.
+		</P
+></DD
+><DT
+>chown file uid gid</DT
+><DD
+><P
+>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		change the UNIX user and group ownership to the given decimal values. Note there is
+		currently no way to remotely look up the UNIX uid and gid values for a given name.
+		This may be addressed in future versions of the CIFS UNIX extensions.
+		</P
+></DD
+><DT
 >cd [directory name]</DT
 ><DD
 ><P
@@ -1139,6 +1175,16 @@ CLASS="REPLACEABLE"
 		</P
 ></DD
 ><DT
+>link source destination</DT
+><DD
+><P
+>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		create a hard link between the source and destination files. The source file
+		must not exist.
+		</P
+></DD
+><DT
 >lowercase</DT
 ><DD
 ><P
@@ -1352,6 +1398,31 @@ CLASS="REPLACEABLE"
 		privileges permitting) from the server. </P
 ></DD
 ><DT
+>setmode &#60;filename&#62; &#60;perm=[+|\-]rsha&#62;</DT
+><DD
+><P
+>A version of the DOS attrib command to set 
+		file permissions. For example: </P
+><P
+><B
+CLASS="COMMAND"
+>setmode myfile +r </B
+></P
+><P
+>would make myfile read only. </P
+></DD
+><DT
+>symlink source destination</DT
+><DD
+><P
+>This command depends on the server supporting the CIFS
+		UNIX extensions and will fail if the server does not. The client requests that the server
+		create a symbolic hard link between the source and destination files. The source file
+		must not exist. Note that the server will not create a link to any path that lies 
+		outside the currently connected share. This is enforced by the Samba server.
+		</P
+></DD
+><DT
 >tar &#60;c|x&#62;[IXbgNa]</DT
 ><DD
 ><P
@@ -1391,27 +1462,13 @@ CLASS="REPLACEABLE"
 		tar will reset the archive bit on all files it backs up (implies 
 		read/write share). </P
 ></DD
-><DT
->setmode &#60;filename&#62; &#60;perm=[+|\-]rsha&#62;</DT
-><DD
-><P
->A version of the DOS attrib command to set 
-		file permissions. For example: </P
-><P
-><B
-CLASS="COMMAND"
->setmode myfile +r </B
-></P
-><P
->would make myfile read only. </P
-></DD
 ></DL
 ></DIV
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN477"
+NAME="AEN501"
 ></A
 ><H2
 >NOTES</H2
@@ -1432,7 +1489,7 @@ NAME="AEN477"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN482"
+NAME="AEN506"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -1465,7 +1522,7 @@ CLASS="ENVAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN490"
+NAME="AEN514"
 ></A
 ><H2
 >INSTALLATION</H2
@@ -1503,7 +1560,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN500"
+NAME="AEN524"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -1519,7 +1576,7 @@ NAME="AEN500"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN504"
+NAME="AEN528"
 ></A
 ><H2
 >VERSION</H2
@@ -1530,7 +1587,7 @@ NAME="AEN504"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN507"
+NAME="AEN531"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbcontrol.1.html b/docs/htmldocs/smbcontrol.1.html
index c824a7cd09..5dc9854a84 100644
--- a/docs/htmldocs/smbcontrol.1.html
+++ b/docs/htmldocs/smbcontrol.1.html
@@ -24,7 +24,7 @@ NAME="AEN5"
 ></A
 ><H2
 >Name</H2
->smbcontrol&nbsp;--&nbsp;send messages to smbd or nmbd processes</DIV
+>smbcontrol&nbsp;--&nbsp;send messages to smbd, nmbd or winbindd processes</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
@@ -65,18 +65,23 @@ CLASS="COMMAND"
 HREF="smbd.8.html"
 TARGET="_top"
 >smbd(8)</A
-> or 
+>, 
 	an <A
 HREF="nmbd.8.html"
 TARGET="_top"
 >nmbd(8)</A
-> daemon running on the 
-	system.</P
+>
+	or a <A
+HREF="winbindd.8.html"
+TARGET="_top"
+>winbindd(8)</A
+> 
+	daemon running on the system.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25"
+NAME="AEN26"
 ></A
 ><H2
 >OPTIONS</H2
@@ -175,8 +180,9 @@ CLASS="CONSTANT"
 		message to smbd which will then close the client connections to
 		the named share. Note that this doesn't affect client connections
 		to any other shares. This message-type takes an argument of the
-		share name for which client connections will be close, or the
+		share name for which client connections will be closed, or the
 		"*" character which will close all currently open shares.
+		This may be useful if you made changes to the access controls on the share.
 		This message can only be sent to <TT
 CLASS="CONSTANT"
 >smbd</TT
@@ -220,7 +226,7 @@ CLASS="CONSTANT"
 		collection, "off" to turn off profile stats collection, "count"
 		to enable only collection of count stats (time stats are 
 		disabled), and "flush" to zero the current profile stats. This can 
-		be sent to any of the destinations.</P
+		be sent to any smbd or nmbd destinations.</P
 ><P
 >The <TT
 CLASS="CONSTANT"
@@ -236,7 +242,7 @@ CLASS="CONSTANT"
 > message-type sends 
 		a "request profile level" message.  The current profile level 
 		setting is returned by a  "profilelevel" message. This can be sent 
-		to any of the destinations.</P
+		to any smbd or nmbd destinations.</P
 ><P
 >The <TT
 CLASS="CONSTANT"
@@ -249,14 +255,6 @@ CLASS="CONSTANT"
 CLASS="CONSTANT"
 >smbd</TT
 >.</P
-><P
->The <TT
-CLASS="CONSTANT"
->close-share</TT
-> message-type sends a
-		message to smbd which forces smbd to close the share that was
-		specified as an argument. This may be useful if you made changes
-		to the access controls on the share.  </P
 ></DD
 ><DT
 >parameters</DT
@@ -270,7 +268,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN82"
+NAME="AEN81"
 ></A
 ><H2
 >VERSION</H2
@@ -281,7 +279,7 @@ NAME="AEN82"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN85"
+NAME="AEN84"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -307,7 +305,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92"
+NAME="AEN91"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbd.8.html b/docs/htmldocs/smbd.8.html
index 72fc10e2e4..6a4996d938 100644
--- a/docs/htmldocs/smbd.8.html
+++ b/docs/htmldocs/smbd.8.html
@@ -272,7 +272,14 @@ TARGET="_top"
 CLASS="FILENAME"
 >		smb.conf(5)</TT
 ></A
-> file.
+> file. <EM
+>Beware:</EM
+>
+		If the directory specified does not exist, <B
+CLASS="COMMAND"
+>smbd</B
+>
+		will log to the default debug log location defined at compile time.
 		</P
 ><P
 >The default log directory is specified at
@@ -354,7 +361,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN120"
+NAME="AEN122"
 ></A
 ><H2
 >FILES</H2
@@ -466,7 +473,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN156"
+NAME="AEN158"
 ></A
 ><H2
 >LIMITATIONS</H2
@@ -485,7 +492,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN160"
+NAME="AEN162"
 ></A
 ><H2
 >ENVIRONMENT VARIABLES</H2
@@ -516,7 +523,7 @@ CLASS="CONSTANT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN169"
+NAME="AEN171"
 ></A
 ><H2
 >PAM INTERACTION</H2
@@ -561,7 +568,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN180"
+NAME="AEN182"
 ></A
 ><H2
 >VERSION</H2
@@ -572,7 +579,7 @@ NAME="AEN180"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN183"
+NAME="AEN185"
 ></A
 ><H2
 >DIAGNOSTICS</H2
@@ -595,7 +602,7 @@ NAME="AEN183"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN188"
+NAME="AEN190"
 ></A
 ><H2
 >SIGNALS</H2
@@ -660,7 +667,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN205"
+NAME="AEN207"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -726,7 +733,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN222"
+NAME="AEN224"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/smbmount.8.html b/docs/htmldocs/smbmount.8.html
index b7263ebf83..9d620f1397 100644
--- a/docs/htmldocs/smbmount.8.html
+++ b/docs/htmldocs/smbmount.8.html
@@ -35,7 +35,7 @@ NAME="AEN8"
 ><P
 ><B
 CLASS="COMMAND"
->smbumount</B
+>smbmount</B
 >  {service} {mount-point} [-o options]</P
 ></DIV
 ><DIV
diff --git a/docs/htmldocs/smbsh.1.html b/docs/htmldocs/smbsh.1.html
index 66081bbe22..ba2cc7b492 100644
--- a/docs/htmldocs/smbsh.1.html
+++ b/docs/htmldocs/smbsh.1.html
@@ -37,12 +37,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >smbsh</B
-> </P
+>  [-W workgroup] [-U username] [-P prefix] [-R &#60;name resolve order&#62;] [-d &#60;debug level&#62;] [-l logfile] [-L libdir]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11"
+NAME="AEN18"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -72,6 +72,223 @@ CLASS="COMMAND"
 >smbsh</B
 > 
 	to work correctly.</P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN28"
+></A
+><H2
+>OPTIONS</H2
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>-W WORKGROUP</DT
+><DD
+><P
+>Override the default workgroup specified in the 
+		workgroup parameter of the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file 
+		for this session. This may be needed to connect to some 
+		servers. </P
+></DD
+><DT
+>-U username[%pass]</DT
+><DD
+><P
+>Sets the SMB username or username and password.
+		If this option is not specified, the user will be prompted for 
+		both the username and the password.  If %pass is not specified, 
+		the user will be prompted for the password.
+		</P
+></DD
+><DT
+>-P prefix</DT
+><DD
+><P
+>This option allows
+		the user to set the directory prefix for SMB access. The 
+		default value if this option is not specified is 
+		<EM
+>smb</EM
+>.
+		</P
+></DD
+><DT
+>-R &#60;name resolve order&#62;</DT
+><DD
+><P
+>This option is used to determine what naming 
+		services and in what order to resolve 
+		host names to IP addresses. The option takes a space-separated 
+		string of different name resolution options.</P
+><P
+>The options are :"lmhosts", "host", "wins" and "bcast". 
+		They cause names to be resolved as follows :</P
+><P
+></P
+><UL
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>lmhosts</TT
+> : 
+			Lookup an IP address in the Samba lmhosts file. If the 
+			line in lmhosts has no name type attached to the 
+			NetBIOS name 
+			(see the <A
+HREF="lmhosts.5.html"
+TARGET="_top"
+>lmhosts(5)</A
+>
+			for details) then any name type matches for lookup.
+			</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>host</TT
+> : 
+			Do a standard host name to IP address resolution, using
+			the system <TT
+CLASS="FILENAME"
+>/etc/hosts</TT
+>, NIS, or DNS
+			lookups. This method of name resolution is operating 
+			system dependent, for instance on IRIX or Solaris this 
+			may be controlled by the <TT
+CLASS="FILENAME"
+>/etc/nsswitch.conf
+			</TT
+> file).  Note that this method is only used 
+			if the NetBIOS name type being queried is the 0x20 
+			(server) name type, otherwise it is ignored.
+			</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>wins</TT
+> : 
+			Query a name with the IP address listed in the 
+			<TT
+CLASS="PARAMETER"
+><I
+>wins server</I
+></TT
+> parameter.  If no 
+			WINS server has been specified this method will be 
+			ignored.
+			</P
+></LI
+><LI
+><P
+><TT
+CLASS="CONSTANT"
+>bcast</TT
+> : 
+			Do a broadcast on each of the known local interfaces 
+			listed in the <TT
+CLASS="PARAMETER"
+><I
+>interfaces</I
+></TT
+>
+			parameter. This is the least reliable of the name 
+			resolution methods as it depends on the target host 
+			being on a locally connected subnet.
+			</P
+></LI
+></UL
+><P
+>If this parameter is not set then the name resolve order 
+		defined in the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> file parameter  
+		(name resolve order) will be used. </P
+><P
+>The default order is lmhosts, host, wins, bcast. Without 
+		this parameter or any entry in the <TT
+CLASS="PARAMETER"
+><I
+>name resolve order
+		</I
+></TT
+> parameter of the <TT
+CLASS="FILENAME"
+>smb.conf</TT
+> 
+		file, the name resolution methods will be attempted in this 
+		order. </P
+></DD
+><DT
+>-d &#60;debug level&#62;</DT
+><DD
+><P
+>debug level is an integer from 0 to 10.</P
+><P
+>The default value if this parameter is not specified
+		is zero.</P
+><P
+>The higher this value, the more detail will be logged
+		about the activities of <B
+CLASS="COMMAND"
+>nmblookup</B
+>. At level
+		0, only critical errors and serious warnings will be logged.
+		</P
+></DD
+><DT
+>-l logfilename</DT
+><DD
+><P
+>If specified causes all debug messages to be
+		written to the file specified by <TT
+CLASS="REPLACEABLE"
+><I
+>logfilename
+		</I
+></TT
+>. If not specified then all messages will be 
+		written to<TT
+CLASS="REPLACEABLE"
+><I
+>stderr</I
+></TT
+>.
+		</P
+></DD
+><DT
+>-L libdir</DT
+><DD
+><P
+>This parameter specifies the location of the 
+		shared libraries used by <B
+CLASS="COMMAND"
+>smbsh</B
+>. The default
+		value is specified at compile time.
+		</P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN91"
+></A
+><H2
+>EXAMPLES</H2
 ><P
 >To use the <B
 CLASS="COMMAND"
@@ -158,7 +375,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN40"
+NAME="AEN112"
 ></A
 ><H2
 >VERSION</H2
@@ -169,7 +386,7 @@ NAME="AEN40"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN43"
+NAME="AEN115"
 ></A
 ><H2
 >BUGS</H2
@@ -202,7 +419,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN52"
+NAME="AEN124"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -225,7 +442,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN58"
+NAME="AEN130"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/wbinfo.1.html b/docs/htmldocs/wbinfo.1.html
index 4cc0ef423f..fe218a8f67 100644
--- a/docs/htmldocs/wbinfo.1.html
+++ b/docs/htmldocs/wbinfo.1.html
@@ -36,12 +36,12 @@ NAME="AEN8"
 ><B
 CLASS="COMMAND"
 >wbinfo</B
->  [-u] [-g] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [-a user%password] [-p]</P
+>  [-u] [-g] [-h name] [-i ip] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m] [-r user] [-a user%password] [-A user%password]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23"
+NAME="AEN26"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -78,7 +78,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN34"
+NAME="AEN37"
 ></A
 ><H2
 >OPTIONS</H2
@@ -122,6 +122,52 @@ CLASS="COMMAND"
 >. </P
 ></DD
 ><DT
+>-h name</DT
+><DD
+><P
+>The <TT
+CLASS="PARAMETER"
+><I
+>-h</I
+></TT
+> option 
+		queries <B
+CLASS="COMMAND"
+>winbindd(8)</B
+> to query the WINS
+		server for the IP address associated with the NetBIOS name
+		specified by the <TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+> parameter.
+		</P
+></DD
+><DT
+>-i ip</DT
+><DD
+><P
+>The <TT
+CLASS="PARAMETER"
+><I
+>-i</I
+></TT
+> option 
+		queries <B
+CLASS="COMMAND"
+>winbindd(8)</B
+> to send a node status
+		request to get the NetBIOS name associated with the IP address
+		specified by the <TT
+CLASS="PARAMETER"
+><I
+>ip</I
+></TT
+> parameter.
+		</P
+></DD
+><DT
 >-n name</DT
 ><DD
 ><P
@@ -228,6 +274,15 @@ CLASS="COMMAND"
 		</P
 ></DD
 ><DT
+>-r username</DT
+><DD
+><P
+>Try to obtain the list of UNIX group ids
+		to which the user belongs.  This only works for users
+		defined on a Domain Controller.
+		</P
+></DD
+><DT
 >-a username%password</DT
 ><DD
 ><P
@@ -236,11 +291,14 @@ CLASS="COMMAND"
 		</P
 ></DD
 ><DT
->-p</DT
+>-A username%password</DT
 ><DD
 ><P
->Attempt a simple 'ping' check that the winbindd
-                is indeed alive.
+>Store username and password used by winbindd 
+		during session setup to a domain controller.  This enables
+		winbindd to operate in a Windows 2000 domain with Restrict
+		Anonymous turned on (a.k.a. Permissions compatiable with
+		Windows 2000 servers only).
 		</P
 ></DD
 ></DL
@@ -249,7 +307,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN98"
+NAME="AEN119"
 ></A
 ><H2
 >EXIT STATUS</H2
@@ -268,7 +326,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN103"
+NAME="AEN124"
 ></A
 ><H2
 >VERSION</H2
@@ -279,7 +337,7 @@ NAME="AEN103"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN106"
+NAME="AEN127"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -297,7 +355,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN111"
+NAME="AEN132"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/docs/htmldocs/winbindd.8.html b/docs/htmldocs/winbindd.8.html
index 51a70042b1..1ecb08cdb4 100644
--- a/docs/htmldocs/winbindd.8.html
+++ b/docs/htmldocs/winbindd.8.html
@@ -109,6 +109,22 @@ CLASS="FILENAME"
 CLASS="VARIABLELIST"
 ><DL
 ><DT
+>hosts</DT
+><DD
+><P
+>User information traditionally stored in 
+		the <TT
+CLASS="FILENAME"
+>hosts(5)</TT
+> file and used by 
+		<B
+CLASS="COMMAND"
+>gethostbyname(3)</B
+> functions. Names are
+		resolved through the WINS server or by broadcast.
+		</P
+></DD
+><DT
 >passwd</DT
 ><DD
 ><P
@@ -169,11 +185,22 @@ group:          files winbind
 ></TR
 ></TABLE
 ></P
+><P
+>The following simple configuration in the
+	<TT
+CLASS="FILENAME"
+>/etc/nsswitch.conf</TT
+> file can be used to initially
+	resolve hostnames from <TT
+CLASS="FILENAME"
+>/etc/hosts</TT
+> and then from the
+	WINS server.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN48"
+NAME="AEN57"
 ></A
 ><H2
 >OPTIONS</H2
@@ -212,7 +239,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN61"
+NAME="AEN70"
 ></A
 ><H2
 >NAME AND ID RESOLUTION</H2
@@ -243,7 +270,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN67"
+NAME="AEN76"
 ></A
 ><H2
 >CONFIGURATION</H2
@@ -532,7 +559,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN158"
+NAME="AEN167"
 ></A
 ><H2
 >EXAMPLE SETUP</H2
@@ -710,7 +737,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN197"
+NAME="AEN206"
 ></A
 ><H2
 >NOTES</H2
@@ -768,7 +795,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN213"
+NAME="AEN222"
 ></A
 ><H2
 >SIGNALS</H2
@@ -819,7 +846,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN230"
+NAME="AEN239"
 ></A
 ><H2
 >FILES</H2
@@ -895,7 +922,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN259"
+NAME="AEN268"
 ></A
 ><H2
 >VERSION</H2
@@ -906,7 +933,7 @@ NAME="AEN259"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN262"
+NAME="AEN271"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -934,7 +961,7 @@ TARGET="_top"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN269"
+NAME="AEN278"
 ></A
 ><H2
 >AUTHOR</H2