Start of merge to 2_2_RELEASE branch for release.

Jeremy.

6 files changed, 276 insertions, 194 deletions

diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index e3bb68dea62..4f0a77e9e32 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "NMBD" "8" "24 January 2002" "" ""
+.TH "NMBD" "8" "26 April 2002" "" ""
 .SH NAME
 nmbd \- NetBIOS name server to provide NetBIOS  over IP naming services to clients
 .SH SYNOPSIS
@@ -126,11 +126,11 @@ parameter in the \fI smb.conf\fRfile.
 The -l parameter specifies a directory 
 into which the "log.nmbd" log file will be created
 for operational data from the running
-\fBnmbd\fR server.
-
-The default log directory is compiled into Samba
+\fBnmbd\fR server. The default log directory is compiled into Samba
 as part of the build process. Common defaults are \fI /usr/local/samba/var/log.nmb\fR, \fI /usr/samba/var/log.nmb\fR or
-\fI/var/log/log.nmb\fR.
+\fI/var/log/log.nmb\fR. \fBBeware:\fR
+If the directory specified does not exist, \fBnmbd\fR
+will log to the default debug log location defined at compile time.
 .TP
 \fB-n <primary NetBIOS name>\fR
 This option allows you to override
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index a29dbe28440..ad98b367e77 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.1
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "RPCCLIENT" "1" "06 December 2001" "" ""
+.TH "RPCCLIENT" "1" "16 April 2002" "" ""
 .SH NAME
 rpcclient \- tool for executing client side  MS-RPC functions
 .SH SYNOPSIS
 .sp
-\fBrpcclient\fR \fBserver\fR [ \fB-A authfile\fR ]  [ \fB-c <command string>\fR ]  [ \fB-d debuglevel\fR ]  [ \fB-h\fR ]  [ \fB-l logfile\fR ]  [ \fB-N\fR ]  [ \fB-s <smb config file>\fR ]  [ \fB-U username[%password]\fR ]  [ \fB-W workgroup\fR ]  [ \fB-N\fR ] 
+\fBrpcclient\fR [ \fB-A authfile\fR ]  [ \fB-c <command string>\fR ]  [ \fB-d debuglevel\fR ]  [ \fB-h\fR ]  [ \fB-l logfile\fR ]  [ \fB-N\fR ]  [ \fB-s <smb config file>\fR ]  [ \fB-U username[%password]\fR ]  [ \fB-W workgroup\fR ]  [ \fB-N\fR ]  \fBserver\fR
 .SH "DESCRIPTION"
 .PP
 This tool is part of the  Sambasuite.
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 834ba66484b..03d10953bed 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "01 February 2002" "" ""
+.TH "SMB.CONF" "5" "26 April 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -30,7 +30,7 @@ line represents either a comment, a section name or a parameter.
 Section and parameter names are not case sensitive.
 .PP
 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 
@@ -70,7 +70,7 @@ client as an extension of their native file systems) or
 printable services (used by the client to access print services 
 on the host running the server).
 .PP
-Sections may be designated \fBguest\fR services, 
+Sections may be designated \fBguest\fR services,
 in which case no password is required to access them. A specified 
 UNIX \fBguest account\fR is used to define access
 privileges in this case.
@@ -381,7 +381,7 @@ protocol negotiation. It can be one of CORE, COREPLUS,
 LANMAN1, LANMAN2 or NT1.
 .TP
 \fB%d\fR
-The process id of the current server 
+The process id of the current server
 process.
 .TP
 \fB%a\fR
@@ -442,7 +442,7 @@ case that the client passes, or if they are forced to be the
 "default" case. Default \fByes\fR.
 .TP
 \fBshort preserve case = yes/no\fR
-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" 
@@ -689,6 +689,9 @@ each parameter for details. Note that some are synonyms.
 \fIlock directory\fR
 .TP 0.2i
 \(bu
+\fIpid directory\fR
+.TP 0.2i
+\(bu
 \fIlog file\fR
 .TP 0.2i
 \(bu
@@ -782,6 +785,9 @@ each parameter for details. Note that some are synonyms.
 \fInt smb support\fR
 .TP 0.2i
 \(bu
+\fInt status support\fR
+.TP 0.2i
+\(bu
 \fInull passwords\fR
 .TP 0.2i
 \(bu
@@ -1080,6 +1086,9 @@ each parameter for details. Note that some are synonyms.
 \fIcreate mode\fR
 .TP 0.2i
 \(bu
+\fIcsc policy\fR
+.TP 0.2i
+\(bu
 \fIdefault case\fR
 .TP 0.2i
 \(bu
@@ -1335,6 +1344,9 @@ each parameter for details. Note that some are synonyms.
 \fIset directory\fR
 .TP 0.2i
 \(bu
+\fIshare modes\fR
+.TP 0.2i
+\(bu
 \fIshort preserve case\fR
 .TP 0.2i
 \(bu
@@ -1551,7 +1563,8 @@ Windows NT PDC is an onerous task. This option allows smbdto create the required
 \fBON DEMAND\fR when a user accesses the Samba server.
 
 In order to use this option, smbd
-must be set to \fIsecurity = server\fR or \fI security = domain\fR and \fIadd user script\fR
+must \fBNOT\fR be set to \fIsecurity = share\fR
+and \fIadd user script\fR
 must be set to a full pathname for a script that will create a UNIX 
 user given one argument of \fI%u\fR, which expands into 
 the UNIX user name to create.
@@ -2102,6 +2115,23 @@ Example: \fBcreate mask = 0775\fR
 \fBcreate mode (S)\fR
 This is a synonym for \fI create mask\fR.
 .TP
+\fBcsc policy (S)\fR
+This stands for \fBclient-side caching 
+policy\fR, and specifies how clients capable of offline
+caching will cache the files in the share. The valid values
+are: manual, documents, programs, disable.
+
+These values correspond to those used on Windows
+servers.
+
+For example, shares containing roaming profiles can have
+offline caching disabled using \fBcsc policy = disable
+\fR\&.
+
+Default: \fBcsc policy = manual\fR
+
+Example: \fBcsc policy = programs\fR
+.TP
 \fBdeadtime (G)\fR
 The value of the parameter (a decimal integer) 
 represents the number of minutes of inactivity before a connection 
@@ -2329,18 +2359,11 @@ DEMAND\fR when a user accesses the Samba server and the
 Windows NT user no longer exists.
 
 In order to use this option, \fBsmbd\fR must be 
-set to \fIsecurity = domain\fR and \fIdelete 
-user script\fR must be set to a full pathname for a script 
-that will delete a UNIX user given one argument of \fI%u
-\fR, which expands into the UNIX user name to delete.
-\fBNOTE\fR that this is different to the \fIadd user script\fR
-which will work with the \fIsecurity = server\fR option 
-as well as \fIsecurity = domain\fR. The reason for this
-is only when Samba is a domain member does it get the information
-on an attempted user logon that a user no longer exists. In the
-\fIsecurity = server\fR mode a missing user
-is treated the same as an invalid password logon attempt. Deleting
-the user in this circumstance would not be a good idea.
+set to \fIsecurity = domain\fR or \fIsecurity =
+user\fR and \fIdelete user script\fR 
+must be set to a full pathname for a script 
+that will delete a UNIX user given one argument of \fI%u\fR, 
+which expands into the UNIX user name to delete.
 
 When the Windows user attempts to access the Samba server, 
 at \fBlogin\fR (session setup in the SMB protocol) 
@@ -2879,7 +2902,7 @@ would force all created directories to have read and execute
 permissions set for 'group' and 'other' as well as the
 read/write/execute bits set for the 'user'.
 .TP
-\fBforce directory\fR
+\fBforce directory  security mode (S)\fR
 This parameter controls what UNIX permission bits 
 can be modified when a Windows NT client is manipulating the UNIX 
 permission on a directory using the native NT security dialog box.
@@ -4649,20 +4672,32 @@ alone.
 Default: \fBnt pipe support = yes\fR
 .TP
 \fBnt smb support (G)\fR
-This boolean parameter controls whether smbd(8)will negotiate NT specific SMB 
-support with Windows NT clients. Although this is a developer 
-debugging option and should be left alone, benchmarking has discovered 
-that Windows NT clients give faster performance with this option 
-set to no. This is still being investigated. 
-If this option is set to no then Samba offers 
-exactly the same SMB calls that versions prior to Samba 2.0 offered. 
-This information may be of use if any users are having problems 
+This boolean parameter controls whether smbd(8)will negotiate NT specific SMB
+support with Windows NT/2k/XP clients. Although this is a developer
+debugging option and should be left alone, benchmarking has discovered
+that Windows NT clients give faster performance with this option
+set to no. This is still being investigated.
+If this option is set to no then Samba offers
+exactly the same SMB calls that versions prior to Samba 2.0 offered.
+This information may be of use if any users are having problems
 with NT SMB support.
 
 You should not need to ever disable this parameter.
 
 Default: \fBnt smb support = yes\fR
 .TP
+\fBnt status support (G)\fR
+This boolean parameter controls whether smbd(8)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 no then Samba offers
+exactly the same DOS error codes that versions prior to Samba 2.2.3
+reported.
+
+You should not need to ever disable this parameter.
+
+Default: \fBnt status support = yes\fR
+.TP
 \fBnull passwords (G)\fR
 Allow or disallow client access to accounts 
 that have null passwords. 
@@ -5076,6 +5111,14 @@ Default: \fBnone\fR
 
 Example: \fBpath = /home/fred\fR
 .TP
+\fBpid directory (G)\fR
+This option specifies the directory where pid 
+files will be placed. 
+
+Default: \fBpid directory = ${prefix}/var/locks\fR
+
+Example: \fBpid directory = /var/run/\fR
+.TP
 \fBposix locking (S)\fR
 The \fBsmbd(8)\fR
 daemon maintains an database of file locks obtained by SMB clients.
@@ -5284,6 +5327,9 @@ This parameter may be used to override the
 compiled-in default printcap name used by the server (usually \fI /etc/printcap\fR). See the discussion of the [printers] section above for reasons 
 why you might want to do this.
 
+To use the CUPS printing interface set \fBprintcap name = cups
+\fR\&.
+
 On System V systems that use \fBlpstat\fR to 
 list available printers you can use \fBprintcap name = lpstat
 \fRto automatically obtain lists of available printers. This 
@@ -6007,6 +6053,29 @@ for details.
 
 Default: \fBset directory = no\fR
 .TP
+\fBshare modes (S)\fR
+This enables or disables the honoring of 
+the \fIshare modes\fR during a file open. These 
+modes are used by clients to gain exclusive read or write access 
+to a file.
+
+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).
+
+The share modes that are enabled by this option are 
+DENY_DOS, DENY_ALL,
+DENY_READ, DENY_WRITE,
+DENY_NONE and DENY_FCB.
+
+This option gives full share compatibility and enabled 
+by default.
+
+You should \fBNEVER\fR turn this parameter 
+off as many Windows applications will break if you do so.
+
+Default: \fBshare modes = yes\fR
+.TP
 \fBshort preserve case (S)\fR
 This boolean parameter controls if new files 
 which conform to 8.3 syntax, that is all in upper case and of 
@@ -7143,7 +7212,7 @@ again.
 
 Default: \fBwinbind cache type = 15\fR
 .TP
-\fBwinbind enum\fR
+\fBwinbind enum users\fR
 On large installations using
 winbindd(8)it may be
 necessary to suppress the enumeration of users through the
@@ -7162,7 +7231,7 @@ usernames.
 
 Default: \fBwinbind enum users = yes \fR
 .TP
-\fBwinbind enum\fR
+\fBwinbind enum groups\fR
 On large installations using
 winbindd(8)it may be
 necessary to suppress the enumeration of groups through the
@@ -7195,9 +7264,13 @@ used when listing a username of the form of \fIDOMAIN
 is only applicable when using the \fIpam_winbind.so\fR
 and \fInss_winbind.so\fR modules for UNIX services.
 
-Example: \fBwinbind separator = \\\fR
+Please note that setting this parameter to + causes problems
+with group membership at least on glibc systems, as the character +
+is used as a special character for NIS in /etc/group.
+
+Example: \fBwinbind separator = \\\\\fR
 
-Example: \fBwinbind separator = +\fR
+Example: \fBwinbind separator = /\fR
 .TP
 \fBwinbind uid\fR
 The winbind gid parameter specifies the range of group 
diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1
index 4b27119673a..f93a4eb8097 100644
--- a/docs/manpages/smbcontrol.1
+++ b/docs/manpages/smbcontrol.1
@@ -3,9 +3,9 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBCONTROL" "1" "06 December 2001" "" ""
+.TH "SMBCONTROL" "1" "25 April 2002" "" ""
 .SH NAME
-smbcontrol \- send messages to smbd or nmbd processes
+smbcontrol \- send messages to smbd, nmbd or winbindd processes
 .SH SYNOPSIS
 .sp
 \fBsmbcontrol\fR [ \fB-i\fR ] 
@@ -16,9 +16,10 @@ smbcontrol \- send messages to smbd or nmbd processes
 This tool is part of the  Sambasuite.
 .PP
 \fBsmbcontrol\fR is a very small program, which 
-sends messages to an smbd(8)or 
-an nmbd(8)daemon running on the 
-system.
+sends messages to an smbd(8), 
+an nmbd(8)
+or a winbindd(8)
+daemon running on the system.
 .SH "OPTIONS"
 .TP
 \fB-i\fR
@@ -52,8 +53,9 @@ The close-share message-type sends a
 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 smbd.
 
 The debug message-type allows 
@@ -76,7 +78,7 @@ parameter. The parameter can be "on" to turn on profile stats
 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.
+be sent to any smbd or nmbd destinations.
 
 The debuglevel message-type sends 
 a "request debug level" message. The current debug level setting 
@@ -86,18 +88,13 @@ sent to any of the destinations.
 The profilelevel 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.
+to any smbd or nmbd destinations.
 
 The printer-notify message-type sends a 
 message to smbd which in turn sends a printer notify message to 
 any Windows NT clients connected to a printer. This message-type 
 takes an argument of the printer name to send notify messages to. 
 This message can only be sent to smbd.
-
-The close-share 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. 
 .TP
 \fBparameters\fR
 any parameters required for the message-type
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 6f4a0ac1edf..1d6595e301f 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBD" "8" "24 January 2002" "" ""
+.TH "SMBD" "8" "26 April 2002" "" ""
 .SH NAME
 smbd \- server to provide SMB/CIFS services to clients
 .SH SYNOPSIS
@@ -120,7 +120,9 @@ file will be created for informational and debug
 messages from the running server. The log 
 file generated is never removed by the server although 
 its size may be controlled by the max log size
-option in the \fI smb.conf(5)\fRfile.
+option in the \fI smb.conf(5)\fRfile. \fBBeware:\fR
+If the directory specified does not exist, \fBsmbd\fR
+will log to the default debug log location defined at compile time.
 
 The default log directory is specified at
 compile time.
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index 290574831cd..6fc0a48a47b 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -3,12 +3,18 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMBPASSWD" "8" "01 February 2002" "" ""
+.TH "SMBPASSWD" "8" "03 April 2002" "" ""
 .SH NAME
 smbpasswd \- change a user's SMB password
 .SH SYNOPSIS
+.PP
+When run by root:
+.sp
+\fBsmbpasswd\fR [ \fBoptions\fR ]  [ \fBusername\fR ]  [ \fBpassword\fR ] 
+.PP
+otherwise:
 .sp
-\fBsmbpasswd\fR [ \fB-a\fR ]  [ \fB-x\fR ]  [ \fB-d\fR ]  [ \fB-e\fR ]  [ \fB-D debuglevel\fR ]  [ \fB-n\fR ]  [ \fB-r <remote machine>\fR ]  [ \fB-R <name resolve order>\fR ]  [ \fB-m\fR ]  [ \fB-j DOMAIN\fR ]  [ \fB-U username[%password]\fR ]  [ \fB-h\fR ]  [ \fB-s\fR ]  [ \fB-w pass\fR ]  [ \fBusername\fR ] 
+\fBsmbpasswd\fR [ \fBoptions\fR ]  [ \fBpassword\fR ] 
 .SH "DESCRIPTION"
 .PP
 This tool is part of the  Sambasuite.
@@ -50,25 +56,95 @@ directly, thus enabling changes to be made even if smbd is not
 running. 
 .SH "OPTIONS"
 .TP
+\fB-L\fR
+Run the smbpasswd command in local mode. This 
+allows a non-root user to specify the root-only options. This 
+is used mostly in test environments where a non-root user needs
+to make changes to the local \fIsmbpasswd\fR file.
+The \fIsmbpasswd\fR file must have read/write 
+permissions for the user running the command.
+.TP
+\fB-h\fR
+This option prints the help string for 
+\fBsmbpasswd\fR. 
+.TP
+\fB-s\fR
+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 \fI/dev/tty\fR 
+(like the \fBpasswd(1)\fR program does). This option 
+is to aid people writing scripts to drive smbpasswd
+.TP
+\fB-c smb.conf file\fR
+This option specifies that the configuration
+file specified should be used instead of the default value
+specified at compile time. 
+.TP
+\fB-D debuglevel\fR
+\fIdebuglevel\fR is an integer 
+from 0 to 10. The default value if this parameter is not specified 
+is zero. 
+
+The higher this value, the more detail will be logged to the 
+log files about the activities of smbpasswd. At level 0, only 
+critical errors and serious warnings will be logged. 
+
+Levels above 1 will generate considerable amounts of log 
+data, and should only be used when investigating a problem. Levels 
+above 3 are designed for use only by developers and generate
+HUGE amounts of log data, most of which is extremely cryptic. 
+.TP
+\fB-r remote machine name\fR
+This option allows a user to specify what machine 
+they wish to change their password on. Without this parameter 
+smbpasswd defaults to the local host. The \fIremote 
+machine name\fR is the NetBIOS name of the SMB/CIFS 
+server to contact to attempt the password change. This name is 
+resolved into an IP address using the standard name resolution 
+mechanism in all programs of the Samba suite. See the \fI-R 
+name resolve order\fR parameter for details on changing 
+this resolving mechanism. 
+
+The username whose password is changed is that of the 
+current UNIX logged on user. See the \fI-U username\fR
+parameter for details on changing the password for a different 
+username. 
+
+Note that if changing a Windows NT Domain password the 
+remote machine specified must be the Primary Domain Controller for 
+the domain (Backup Domain Controllers only have a read-only
+copy of the user account database and will not allow the password 
+change).
+
+\fBNote\fR that Windows 95/98 do not have 
+a real password database so it is not possible to change passwords 
+specifying a Win95/98 machine as remote machine target. 
+.TP
+\fB-U username[%pass]\fR
+This option may only be used in conjunction 
+with the \fI-r\fR option. When changing
+a password on a remote machine it allows the user to specify 
+the user name on that machine whose password will be changed. It 
+is present to allow users who have different user names on 
+different systems to change these passwords. The optional
+%pass may be used to specify to old password.
+
+In particular, this parameter specifies the username
+used to create the machine account when invoked with -j
+.TP
+\fBNOTE:\fR
+\fBThe following options are available only when the smbpasswd command is
+run as root or in local mode.\fR
+.TP
 \fB-a\fR
 This option specifies that the username 
 following should be added to the local smbpasswd file, with the 
-new password typed (type <Enter> for the old password). This 
-option is ignored if the username following already exists in 
+new password typed. This 
+option is ignored if the username specified already exists in 
 the smbpasswd file and it is treated like a regular change 
 password command. Note that the user to be added must already exist 
 in the system password file (usually \fI/etc/passwd\fR)
 else the request to add the user will fail. 
-
-This option is only available when running smbpasswd 
-as root. 
-.TP
-\fB-x\fR
-This option specifies that the username 
-following should be deleted from the local smbpasswd file.
-
-This option is only available when running smbpasswd as 
-root.
 .TP
 \fB-d\fR
 This option specifies that the username following 
@@ -83,9 +159,6 @@ format) there is no space in the user's password entry to write
 this information and so the user is disabled by writing 'X' characters 
 into the password space in the smbpasswd file. See \fBsmbpasswd(5)
 \fRfor details on the 'old' and new password file formats.
-
-This option is only available when running smbpasswd as 
-root.
 .TP
 \fB-e\fR
 This option specifies that the username following 
@@ -98,22 +171,11 @@ If the smbpasswd file is in the 'old' format, then \fB smbpasswd\fR will prompt
 otherwise the account will be enabled by removing the 'D'
 flag from account control space in the \fI smbpasswd\fR file. See \fBsmbpasswd (5)\fR for 
 details on the 'old' and new password file formats. 
-
-This option is only available when running smbpasswd as root. 
 .TP
-\fB-D debuglevel\fR
-\fIdebuglevel\fR is an integer 
-from 0 to 10. The default value if this parameter is not specified 
-is zero. 
-
-The higher this value, the more detail will be logged to the 
-log files about the activities of smbpasswd. At level 0, only 
-critical errors and serious warnings will be logged. 
-
-Levels above 1 will generate considerable amounts of log 
-data, and should only be used when investigating a problem. Levels 
-above 3 are designed for use only by developers and generate
-HUGE amounts of log data, most of which is extremely cryptic. 
+\fB-m\fR
+This option tells smbpasswd that the account 
+being changed is a MACHINE account. Currently this is used 
+when Samba is being used as an NT Primary Domain Controller.
 .TP
 \fB-n\fR
 This option specifies that the username following 
@@ -128,35 +190,62 @@ file the administrator must set the following parameter in the [global]
 section of the \fIsmb.conf\fR file : 
 
 \fBnull passwords = yes\fR
-
-This option is only available when running smbpasswd as 
-root.
 .TP
-\fB-r remote machine name\fR
-This option allows a user to specify what machine 
-they wish to change their password on. Without this parameter 
-smbpasswd defaults to the local host. The \fIremote 
-machine name\fR is the NetBIOS name of the SMB/CIFS 
-server to contact to attempt the password change. This name is 
-resolved into an IP address using the standard name resolution 
-mechanism in all programs of the Samba suite. See the \fI-R 
-name resolve order\fR parameter for details on changing 
-this resolving mechanism. 
+\fB-w password\fR
+This parameter is only available is Samba
+has been configured to use the experimental
+\fB--with-ldapsam\fR option. The \fI-w\fR 
+switch is used to specify the password to be used with the 
+\fIldap admin 
+dn\fR. Note that the password is stored in
+the \fIprivate/secrets.tdb\fR and is keyed off 
+of the admin's DN. This means that if the value of \fIldap
+admin dn\fR ever changes, the password will beed to be 
+manually updated as well.
+.TP
+\fB-x\fR
+This option specifies that the username 
+following should be deleted from the local smbpasswd file.
+.TP
+\fB-j DOMAIN\fR
+This option is used to add a Samba server 
+into a Windows NT Domain, as a Domain member capable of authenticating 
+user accounts to any Domain Controller in the same way as a Windows 
+NT Server. See the \fBsecurity = domain\fR option in 
+the \fIsmb.conf(5)\fR man page. 
 
-The username whose password is changed is that of the 
-current UNIX logged on user. See the \fI-U username\fR
-parameter for details on changing the password for a different 
-username. 
+This command can work both with and without the -U parameter. 
 
-Note that if changing a Windows NT Domain password the 
-remote machine specified must be the Primary Domain Controller for 
-the domain (Backup Domain Controllers only have a read-only
-copy of the user account database and will not allow the password 
-change).
+When invoked with -U, that username (and optional password) are
+used to contact the PDC (which must be specified with -r) to both
+create a machine account, and to set a password on it.
 
-\fBNote\fR that Windows 95/98 do not have 
-a real password database so it is not possible to change passwords 
-specifying a Win95/98 machine as remote machine target. 
+Alternately, if -U is omitted, Samba will contact its PDC
+and attempt to change the password on a pre-existing account. 
+
+In order to be used in this way, the Administrator for 
+the Windows NT Domain must have used the program "Server Manager 
+for Domains" to add the primary NetBIOS name of the Samba server 
+as a member of the Domain. 
+
+After this has been done, to join the Domain invoke \fB smbpasswd\fR with this parameter. smbpasswd will then 
+look up the Primary Domain Controller for the Domain (found in 
+the \fIsmb.conf\fR file in the parameter 
+\fIpassword server\fR and change the machine account 
+password used to create the secure Domain communication. 
+
+Either way, this password is then stored by smbpasswd in a TDB, 
+writeable only by root, called \fIsecrets.tdb\fR 
+
+Once this operation has been performed the \fI smb.conf\fR file may be updated to set the \fB security = domain\fR option and all future logins
+to the Samba server will be authenticated to the Windows NT 
+PDC. 
+
+Note that even though the authentication is being 
+done to the PDC all users accessing the Samba server must still 
+have a valid UNIX account on that machine. 
+The \fBwinbindd(8)\fR daemon can be used
+to create UNIX accounts for NT users.
 .TP
 \fB-R name resolve order\fR
 This option allows the user of smbpasswd to determine 
@@ -177,7 +266,7 @@ any name type matches for lookup.
 host : Do a standard host 
 name to IP address resolution, using the system \fI/etc/hosts
 \fR, NIS, or DNS lookups. This method of name resolution 
-is operating system depended for instance on IRIX or Solaris this 
+is operating system dependent. For instance, on IRIX or Solaris this 
 may be controlled by the \fI/etc/nsswitch.conf\fR 
 file). Note that this method is only used if the NetBIOS name 
 type being queried is the 0x20 (server) name type, otherwise 
@@ -203,94 +292,15 @@ and without this parameter or any entry in the
 be attempted in this order. 
 .PP
 .TP
-\fB-m\fR
-This option tells smbpasswd that the account 
-being changed is a MACHINE account. Currently this is used 
-when Samba is being used as an NT Primary Domain Controller.
-
-This option is only available when running smbpasswd as root. 
-.TP
-\fB-j DOMAIN\fR
-This option is used to add a Samba server 
-into a Windows NT Domain, as a Domain member capable of authenticating 
-user accounts to any Domain Controller in the same way as a Windows 
-NT Server. See the \fBsecurity = domain\fR option in 
-the \fIsmb.conf(5)\fR man page. 
-
-This command can work both with and without the -U parameter. 
-
-When invoked with -U, that username (and optional password) are
-used to contact the PDC (which must be specified with -r) to both
-create a machine account, and to set a password on it.
-
-Alternately, if -U is omitted, Samba will contact its PDC
-and attempt to change the password on a pre-existing account. 
-
-In order to be used in this way, the Administrator for 
-the Windows NT Domain must have used the program "Server Manager 
-for Domains" to add the primary NetBIOS name of the Samba server 
-as a member of the Domain. 
-
-After this has been done, to join the Domain invoke \fB smbpasswd\fR with this parameter. smbpasswd will then 
-look up the Primary Domain Controller for the Domain (found in 
-the \fIsmb.conf\fR file in the parameter 
-\fIpassword server\fR and change the machine account 
-password used to create the secure Domain communication. 
-
-Either way, this password is then stored by smbpasswd in a TDB, 
-writeable only by root, called \fIsecrets.tdb\fR 
-
-Once this operation has been performed the \fI smb.conf\fR file may be updated to set the \fB security = domain\fR option and all future logins
-to the Samba server will be authenticated to the Windows NT 
-PDC. 
-
-Note that even though the authentication is being 
-done to the PDC all users accessing the Samba server must still 
-have a valid UNIX account on that machine. 
-The \fBwinbindd(8)\fR daemon can be used
-to create UNIX accounts for NT users.
-
-This option is only available when running smbpasswd as root. 
-.TP
-\fB-U username\fR
-This option may only be used in conjunction 
-with the \fI-r\fR option. When changing
-a password on a remote machine it allows the user to specify 
-the user name on that machine whose password will be changed. It 
-is present to allow users who have different user names on 
-different systems to change these passwords. 
-
-In particular, this parameter specifies the username
-used to create the machine account when invoked with -j
-.TP
-\fB-h\fR
-This option prints the help string for \fB smbpasswd\fR, selecting the correct one for running as root 
-or as an ordinary user. 
-.TP
-\fB-s\fR
-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 \fI/dev/tty\fR 
-(like the \fBpasswd(1)\fR program does). This option 
-is to aid people writing scripts to drive smbpasswd
-.TP
-\fB-w password\fR
-This parameter is only available is Samba
-has been configured to use the experimental
-\fB--with-ldapsam\fR option. The \fI-w\fR 
-switch is used to specify the password to be used with the 
-\fIldap admin 
-dn\fR. Note that the password is stored in
-the \fIprivate/secrets.tdb\fR and is keyed off 
-of the admin's DN. This means that if the value of \fIldap
-admin dn\fR ever changes, the password will beed to be 
-manually updated as well.
-.TP
 \fBusername\fR
 This specifies the username for all of the 
 \fBroot only\fR options to operate on. Only root 
 can specify this parameter as only root has the permission needed 
 to modify attributes directly in the local smbpasswd file. 
+.TP
+\fBpassword\fR
+This specifies the new password. If this parameter
+is specified you will not be prompted for the new password.
 .SH "NOTES"
 .PP
 Since \fBsmbpasswd\fR works in client-server