summaryrefslogtreecommitdiffstats
path: root/docs/manpages
diff options
context:
space:
mode:
Diffstat (limited to 'docs/manpages')
-rw-r--r--docs/manpages/findsmb.15
-rw-r--r--docs/manpages/lmhosts.57
-rw-r--r--docs/manpages/make_smbcodepage.111
-rw-r--r--docs/manpages/make_unicodemap.1199
-rw-r--r--docs/manpages/nmbd.823
-rw-r--r--docs/manpages/nmblookup.112
-rw-r--r--docs/manpages/rpcclient.144
-rw-r--r--docs/manpages/samba.72
-rw-r--r--docs/manpages/smb.conf.5846
-rw-r--r--docs/manpages/smbcacls.114
-rw-r--r--docs/manpages/smbclient.196
-rw-r--r--docs/manpages/smbcontrol.12
-rw-r--r--docs/manpages/smbd.873
-rw-r--r--docs/manpages/smbmnt.86
-rw-r--r--docs/manpages/smbmount.826
-rw-r--r--docs/manpages/smbpasswd.516
-rw-r--r--docs/manpages/smbpasswd.817
-rw-r--r--docs/manpages/smbrun.12
-rw-r--r--docs/manpages/smbsh.17
-rw-r--r--docs/manpages/smbspool.88
-rw-r--r--docs/manpages/smbstatus.12
-rw-r--r--docs/manpages/smbtar.15
-rw-r--r--docs/manpages/smbumount.85
-rw-r--r--docs/manpages/swat.823
-rw-r--r--docs/manpages/testparm.111
-rw-r--r--docs/manpages/testprns.15
-rw-r--r--docs/manpages/wbinfo.15
-rw-r--r--docs/manpages/winbindd.831
28 files changed, 880 insertions, 623 deletions
diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1
index 24dbc743c5b..381b5116a2e 100644
--- a/docs/manpages/findsmb.1
+++ b/docs/manpages/findsmb.1
@@ -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 FINDSMB 1 "23 Jun 2001" "findsmb 2.2.0a"
+.TH "FINDSMB" "1" "03 May 2001" "" ""
.SH NAME
findsmb \- list info about machines that respond to SMB name queries on a subnet
.SH SYNOPSIS
@@ -74,7 +74,8 @@ the Samba suite.
.PP
\fBnmbd(8)\fR,
\fBsmbclient(1)
-\fR.SH "AUTHOR"
+\fR
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index ba4df3f050f..f960b17d02e 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.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 LMHOSTS 5 "23 Jun 2001" "lmhosts 2.2.0a"
+.TH "LMHOSTS" "5" "05 July 2001" "" ""
.SH NAME
lmhosts \- The Samba NetBIOS hosts file
.SH SYNOPSIS
@@ -11,7 +11,7 @@ lmhosts \- The Samba NetBIOS hosts file
\fIlmhosts\fR is the SambaNetBIOS name to IP address mapping file.
.SH "DESCRIPTION"
.PP
-This file is part of the < Sambasuite.
+This file is part of the Sambasuite.
.PP
\fIlmhosts\fR is the \fBSamba
\fRNetBIOS name to IP address mapping file. It
@@ -76,7 +76,8 @@ the Samba suite.
.SH "SEE ALSO"
.PP
\fBsmbclient(1)
-\fR.SH "AUTHOR"
+\fR
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/make_smbcodepage.1 b/docs/manpages/make_smbcodepage.1
index bffe6642ace..ef0cb4d2dda 100644
--- a/docs/manpages/make_smbcodepage.1
+++ b/docs/manpages/make_smbcodepage.1
@@ -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 MAKE_SMBCODEPAGE 1 "23 Jun 2001" "make_smbcodepage 2.2.0a"
+.TH "MAKE_SMBCODEPAGE" "1" "03 May 2001" "" ""
.SH NAME
make_smbcodepage \- construct a codepage file for Samba
.SH SYNOPSIS
@@ -29,11 +29,11 @@ This is the codepage we are processing (a
number, e.g. 850).
.TP
\fBinputfile\fR
-This is the input file to process. In t
-he '\fIc\fR' case this will be a text
+This is the input file to process. In
+the \fIc\fR case this will be a text
codepage definition file such as the ones found in the Samba
\fIsource/codepages\fR directory. In
-the '\fId\fR' case this will be the
+the \fId\fR case this will be the
binary format codepage definition file normally found in
the \fIlib/codepages\fR directory in the
Samba install directory path.
@@ -124,7 +124,8 @@ the Samba suite.
.SH "SEE ALSO"
.PP
\fBsmbd(8)\fR,
-smb.conf(5).SH "AUTHOR"
+smb.conf(5)
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/make_unicodemap.1 b/docs/manpages/make_unicodemap.1
index be29bb19fb0..77a580dcea9 100644
--- a/docs/manpages/make_unicodemap.1
+++ b/docs/manpages/make_unicodemap.1
@@ -1,100 +1,99 @@
-.TH MAKE_UNICODEMAP 1 "23 Jun 2001" "make_unicodemap 2.2.0a"
-.PP
-.SH "NAME"
-make_unicodemap \- Construct a unicode map file for Samba
-.PP
-.SH "SYNOPSIS"
-.PP
-\fBmake_unicodemap\fP codepage inputfile outputfile
-.PP
-.SH "DESCRIPTION"
-.PP
-This program is part of the \fBSamba\fP suite\&.
-.PP
-\fBmake_unicodemap\fP compiles text unicode map files into binary unicode
-map files for use with the internationalization features of Samba 2\&.0
-.PP
-.SH "OPTIONS"
-.PP
-.IP
-.IP "codepage"
-This is the codepage or UNIX character set we are processing (a number, e\&.g\&. 850)\&.
-.IP
-.IP "inputfile"
-This is the input file to process\&. This is a text unicode map file
-such as the ones found in the Samba \fIsource/codepages\fP directory\&.
-.IP
-.IP "outputfile"
-This is the binary output file to produce\&.
-.IP
-.PP
-.SH "Samba Unicode Map Files"
-.PP
-A text Samba unicode map file is a description that tells
-Samba how to map characters from a specified DOS code page or UNIX character
-set to 16 bit unicode\&.
-.PP
-A binary Samba unicode map file is a binary representation of
-the same information, including a value that specifies what codepage
-or UNIX character set this file is describing\&.
-.PP
-.SH "FILES"
-.PP
-\fBCP<codepage>\&.TXT\fP
-.PP
-These are the input (text) unicode map files provided in the Samba
-\fIsource/codepages\fP directory\&.
-.PP
-A text unicode map file consists of multiple lines
-containing two fields\&. These fields are :
-.PP
-.IP
-.IP o
-\fBcharacter\fP: which is the (hex) character mapped on this
-line\&.
-.IP
-.IP o
-\fBunicode\fP: which is the (hex) 16 bit unicode character that the
-character will map to\&.
-.IP
-.PP
-\fBunicode_map\&.<codepage>\fP These are the output (binary) unicode map files
-produced and placed in the Samba destination \fIlib/codepage\fP
-directory\&.
-.PP
-.SH "INSTALLATION"
-.PP
-The location of the server and its support files is a matter for
-individual system administrators\&. The following are thus suggestions
-only\&.
-.PP
-It is recommended that the \fBmake_unicodemap\fP program be installed
-under the \fI/usr/local/samba\fP hierarchy, in a directory readable by
-all, writeable only by root\&. The program itself should be executable
-by all\&. The program should NOT be setuid or setgid!
-.PP
-.SH "VERSION"
-.PP
-This man page is correct for version 2\&.0 of the Samba suite\&.
-.PP
-.SH "SEE ALSO"
-.PP
-\fBsmb\&.conf(5)\fP, \fBsmbd (8)\fP
-.PP
-.SH "AUTHOR"
-.PP
-The original Samba software and related utilities were created by
-Andrew Tridgell samba@samba\&.org\&. Samba is now developed
-by the Samba Team as an Open Source project similar to the way the
-Linux kernel is developed\&.
-.PP
-The original Samba man pages were written by Karl Auer\&. The man page
-sources were converted to YODL format (another excellent piece of Open
-Source software, available at
-\fBftp://ftp\&.icce\&.rug\&.nl/pub/unix/\fP)
-and updated for the Samba2\&.0 release by Jeremy Allison\&.
-samba@samba\&.org\&.
-.PP
-See \fBsamba (7)\fP to find out how to get a full
-list of contributors and details on how to submit bug reports,
-comments etc\&.
+.\" This manpage has been automatically generated by docbook2man-spec
+.\" from a DocBook document. docbook2man-spec can be found at:
+.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/>
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "MAKE_UNICODEMAP" "1" "22 June 2001" "" ""
+.SH NAME
+make_unicodemap \- construct a unicode map file for Samba
+.SH SYNOPSIS
+.sp
+\fBmake_unicodemap\fR \fBcodepage\fR \fBinputfile\fR \fBoutputfile\fR
+.SH "DESCRIPTION"
+.PP
+This tool is part of the Samba
+suite.
+.PP
+\fBmake_unicodemap\fR compiles text unicode map
+files into binary unicode map files for use with the
+internationalization features of Samba 2.2.
+.SH "OPTIONS"
+.TP
+\fBcodepage\fR
+This is the codepage or UNIX character
+set we are processing (a number, e.g. 850).
+.TP
+\fBinputfile\fR
+This is the input file to process. This is a
+text unicode map file such as the ones found in the Samba
+\fIsource/codepages\fR directory.
+.TP
+\fBoutputfile\fR
+This is the binary output file to produce.
+.SH "SAMBA UNICODE MAP FILES"
+.PP
+A text Samba unicode map file is a description that tells Samba
+how to map characters from a specified DOS code page or UNIX character
+set to 16 bit unicode.
+.PP
+A binary Samba unicode map file is a binary representation
+of the same information, including a value that specifies what
+codepage or UNIX character set this file is describing.
+.SH "FILES"
+.PP
+\fICP<codepage>.TXT\fR
+.PP
+These are the input (text) unicode map files provided
+in the Samba \fIsource/codepages\fR
+directory.
+.PP
+A text unicode map file consists of multiple lines
+containing two fields. These fields are :
+.TP 0.2i
+\(bu
+\fIcharacter\fR - which is
+the (hex) character mapped on this line.
+.TP 0.2i
+\(bu
+\fIunicode\fR - which
+is the (hex) 16 bit unicode character that the character
+will map to.
+.PP
+\fIunicode_map.<codepage>\fR - These are
+the output (binary) unicode map files produced and placed in
+the Samba destination \fIlib/codepage\fR
+directory.
+.PP
+.SH "INSTALLATION"
+.PP
+The location of the server and its support files is a matter
+for individual system administrators. The following are thus
+suggestions only.
+.PP
+It is recommended that the \fBmake_unicodemap\fR
+program be installed under the
+\fI$prefix/samba\fR hierarchy,
+in a directory readable by all, writeable only by root. The
+program itself should be executable by all. The program
+should NOT be setuid or setgid!
+.SH "VERSION"
+.PP
+This man page is correct for version 2.2 of
+the Samba suite.
+.SH "SEE ALSO"
+.PP
+\fBsmbd(8)\fR,
+smb.conf(5)
+.SH "AUTHOR"
+.PP
+The original Samba software and related utilities
+were created by Andrew Tridgell. Samba is now developed
+by the Samba Team as an Open Source project similar
+to the way the Linux kernel is developed.
+.PP
+The original Samba man pages were written by Karl Auer.
+The man page sources were converted to YODL format (another
+excellent piece of Open Source software, available at
+ftp://ftp.icce.rug.nl/pub/unix/ <URL:ftp://ftp.icce.rug.nl/pub/unix/>) and updated for the Samba 2.0
+release by Jeremy Allison. The conversion to DocBook for
+Samba 2.2 was done by Gerald Carter
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 6b4d7a43a14..851383e5c0a 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 "23 Jun 2001" "nmbd 2.2.0a"
+.TH "NMBD" "8" "22 June 2001" "" ""
.SH NAME
nmbd \- NetBIOS name server to provide NetBIOS over IP naming services to clients
.SH SYNOPSIS
@@ -15,7 +15,7 @@ This program is part of the Samba suite.
.PP
\fBnmbd\fR is a server that understands
and can reply to NetBIOS over IP name service requests, like
-those produced by SMBD/CIFS clients such as Windows 95/98/ME,
+those produced by SMB/CIFS clients such as Windows 95/98/ME,
Windows NT, Windows 2000, and LanManager clients. It also
participates in the browsing protocols which make up the
Windows "Network Neighborhood" view.
@@ -75,7 +75,8 @@ for \fBnmbd\fR.
NetBIOS lmhosts file. The lmhosts
file is a list of NetBIOS names to IP addresses that
is loaded by the nmbd server and used via the name
-resolution mechanism name resolve orderto resolve any NetBIOS name queries needed by the server. Note
+resolution mechanism name resolve order
+to resolve any NetBIOS name queries needed by the server. Note
that the contents of this file are \fBNOT\fR
used by \fBnmbd\fR to answer any name queries.
Adding a line to this file affects name NetBIOS resolution
@@ -111,7 +112,8 @@ and generate HUGE amounts of log data, most of which is extremely
cryptic.
Note that specifying this parameter here will override
-the log levelparameter in the \fI smb.conf\fRfile.
+the log level
+parameter in the \fI smb.conf\fRfile.
.TP
\fB-l <log file>\fR
The -l parameter specifies a path
@@ -175,17 +177,20 @@ See the section INSTALLATION below.
.TP
\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
This is the default location of the
-\fIsmb.conf\fRserver configuration file. Other common places that systems
+\fIsmb.conf\fR
+server configuration file. Other common places that systems
install this file are \fI/usr/samba/lib/smb.conf\fR
and \fI/etc/smb.conf\fR.
When run as a WINS server (see the
-wins supportparameter in the \fI smb.conf(5)\fRman page), \fBnmbd\fR
+wins support
+parameter in the \fI smb.conf(5)\fRman page), \fBnmbd\fR
will store the WINS database in the file \fIwins.dat\fR
in the \fIvar/locks\fR directory configured under
wherever Samba was configured to install itself.
-If \fBnmbd\fR is acting as a \fB browse master\fR (see the local masterparameter in the \fI smb.conf(5)\fRman page), \fBnmbd\fR
+If \fBnmbd\fR is acting as a \fB browse master\fR (see the local master
+parameter in the \fI smb.conf(5)\fRman page), \fBnmbd\fR
will store the browsing database in the file \fIbrowse.dat
\fRin the \fIvar/locks\fR directory
configured under wherever Samba was configured to install itself.
@@ -198,11 +203,11 @@ The correct way to terminate \fBnmbd\fR is to send it
a SIGTERM (-15) signal and wait for it to die on its own.
.PP
\fBnmbd\fR will accept SIGHUP, which will cause
-it to dump out it's namelists into the file \fInamelist.debug
+it to dump out its namelists into the file \fInamelist.debug
\fRin the \fI/usr/local/samba/var/locks\fR
directory (or the \fIvar/locks\fR directory configured
under wherever Samba was configured to install itself). This will also
-cause \fBnmbd\fR to dump out it's server database in
+cause \fBnmbd\fR to dump out its server database in
the \fIlog.nmb\fR file. In addition, the debug log level
of nmbd may be raised by sending it a SIGUSR1 (\fBkill -USR1
<nmbd-pid>\fR) and lowered by sending it a
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index 05fa4762f9f..afc1ec3a107 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -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 NMBLOOKUP 1 "23 Jun 2001" "nmblookup 2.2.0a"
+.TH "NMBLOOKUP" "1" "22 June 2001" "" ""
.SH NAME
nmblookup \- NetBIOS over TCP/IP client used to lookup NetBIOS names
.SH SYNOPSIS
@@ -44,8 +44,9 @@ Try and bind to UDP port 137 to send and receive UDP
datagrams. The reason for this option is a bug in Windows 95
where it ignores the source port of the requesting packet
and only replies to UDP port 137. Unfortunately, on most UNIX
-systems root privilage is needed to bind to this port, and
-in addition, if the nmbd(8)daemon is running on this machine it also binds to this port.
+systems root privilege is needed to bind to this port, and
+in addition, if the nmbd(8)
+daemon is running on this machine it also binds to this port.
.TP
\fB-A\fR
Interpret \fIname\fR as
@@ -126,7 +127,7 @@ used to query DNS servers). To query a WINS server,
.PP
For example, running :
.PP
-\fBnmblookup -U samba.org -R IRIX#1B'\fR
+\fBnmblookup -U samba.org -R 'IRIX#1B'\fR
.PP
would query the WINS server samba.org for the domain
master browser (1B name type) for the IRIX workgroup.
@@ -137,7 +138,8 @@ the Samba suite.
.SH "SEE ALSO"
.PP
\fBnmbd(8)\fR,
-samba(7).SH "AUTHOR"
+samba(7)
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index ab1639732ab..9dce67898ab 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.1
@@ -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 RPCCLIENT 1 "23 Jun 2001" "rpcclient 2.2.0a"
+.TH "RPCCLIENT" "1" "22 June 2001" "" ""
.SH NAME
rpcclient \- tool for executing client side MS-RPC functions
.SH SYNOPSIS
@@ -50,14 +50,15 @@ below))
\fB-d debuglevel\fR
set the debuglevel. Debug level 0 is the lowest
and 100 being the highest. This should be set to 100 if you are
-planning on submitting a bug report to the Samba team (see BUGS.txt).
+planning on submitting a bug report to the Samba team (see \fIBUGS.txt\fR).
.TP
\fB-h\fR
Print a summary of command line options.
.TP
\fB-l logbasename\fR
-File name for log/debug files. .client will be
-appended. The log file is never removed by the client.
+File name for log/debug files. The extension
+\&'.client' will be appended. The log file is never removed
+by the client.
.TP
\fB-N\fR
instruct \fBrpcclient\fR not to ask
@@ -73,7 +74,7 @@ Sets the SMB username or username and password.
If %password is not specified, The user will be prompted. The
client will first check the \fBUSER\fR environment variable, then the
-\fBLOGNAME\fR variable and if either exist, the
+\fBLOGNAME\fR variable and if either exists, the
string is uppercased. If these environmental variables are not
found, the username GUEST is used.
@@ -93,9 +94,8 @@ it in directly.
.TP
\fB-W domain\fR
Set the SMB domain of the username. This
-overrides the default domain which is the domain of the
-server specified with the \fI-S\fR option.
-If the domain specified is the same as the server's NetBIOS name,
+overrides the default domain which is the domain defined in
+smb.conf. If the domain specified is the same as the server's NetBIOS name,
it causes the client to log on using the server's local SAM (as
opposed to the Domain SAM).
.SH "COMMANDS"
@@ -106,10 +106,12 @@ opposed to the Domain SAM).
\fBlsaquery\fR
.TP 0.2i
\(bu
-\fBlookupsids\fR
+\fBlookupsids\fR - Resolve a list
+of SIDs to usernames.
.TP 0.2i
\(bu
-\fBlookupnames\fR
+\fBlookupnames\fR - Resolve s list
+of usernames to SIDs.
.TP 0.2i
\(bu
\fBenumtrusts\fR
@@ -130,6 +132,18 @@ opposed to the Domain SAM).
.TP 0.2i
\(bu
\fBquerygroupmem\fR
+.TP 0.2i
+\(bu
+\fBqueryaliasmem\fR
+.TP 0.2i
+\(bu
+\fBquerydispinfo\fR
+.TP 0.2i
+\(bu
+\fBquerydominfo\fR
+.TP 0.2i
+\(bu
+\fBenumdomgroups\fR
.PP
.PP
.PP
@@ -180,6 +194,12 @@ and the \fIport\fRmust be a valid port name (see
\fBenumports\fR.
.TP 0.2i
\(bu
+\fBdeldriver\fR - Delete the
+specified printer driver for all architectures. This
+does not delete the actual driver files from the server,
+only the entry from the server's list of drivers.
+.TP 0.2i
+\(bu
\fBenumdata\fR - Enumerate all
printer setting data stored on the server. On Windows NT clients,
these values are stored in the registry, while Samba servers
@@ -283,7 +303,7 @@ been developed from examining Network traces. No documentation is
available from the original creators (Microsoft) on how MSRPC over
SMB works, or how the individual MSRPC services work. Microsoft's
implementation of these services has been demonstrated (and reported)
-to be... a bit flakey in places.
+to be... a bit flaky in places.
.PP
The development of Samba's implementation is also a bit rough,
and as more of the services are understood, it can even result in
@@ -304,6 +324,6 @@ by the Samba Team as an Open Source project similar
to the way the Linux kernel is developed.
.PP
The original rpcclient man page was written by Matthew
-Geddes, Luke Kenneth Casson, and rewriten by Gerald Carter.
+Geddes, Luke Kenneth Casson Leighton, and rewritten by Gerald Carter.
The conversion to DocBook for Samba 2.2 was done by Gerald
Carter.
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index 2fe48c759c8..666240006ad 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -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 SAMBA 7 "23 Jun 2001" "samba 2.2.0a"
+.TH "SAMBA" "7" "03 May 2001" "" ""
.SH NAME
SAMBA \- A Windows SMB/CIFS fileserver for UNIX
.SH SYNOPSIS
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index a10c40dfac7..6a2f5f6e259 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 "23 Jun 2001" "smb.conf 2.2.0a"
+.TH "SMB.CONF" "5" "05 July 2001" "" ""
.SH NAME
smb.conf \- The configuration file for the Samba suite
.SH "SYNOPSIS"
@@ -447,7 +447,7 @@ 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"
to permit long filenames to retain their case, while short names
-are lowered. Default \fByes\fR.
+are lowercased. Default \fByes\fR.
.PP
By default, Samba 2.2 has the same semantics as a Windows
NT server, in that it is case insensitive but case preserving.
@@ -474,7 +474,7 @@ If the client has previously registered a username
with the system and now supplies a correct password for that
username then the connection is allowed.
.IP 3.
-The client's netbios name and any previously
+The client's NetBIOS name and any previously
used user names are checked against the supplied password, if
they match then the connection is allowed as the corresponding
user.
@@ -503,10 +503,13 @@ Here is a list of all global parameters. See the section of
each parameter for details. Note that some are synonyms.
.TP 0.2i
\(bu
-\fIadd user script\fR
+\fIadd printer command\fR
+.TP 0.2i
+\(bu
+\fIadd share command\fR
.TP 0.2i
\(bu
-\fIaddprinter command\fR
+\fIadd user script\fR
.TP 0.2i
\(bu
\fIallow trusted domains\fR
@@ -530,6 +533,9 @@ each parameter for details. Note that some are synonyms.
\fIchange notify timeout\fR
.TP 0.2i
\(bu
+\fIchange share command\fR
+.TP 0.2i
+\(bu
\fIcharacter set\fR
.TP 0.2i
\(bu
@@ -569,10 +575,13 @@ each parameter for details. Note that some are synonyms.
\fIdefault service\fR
.TP 0.2i
\(bu
-\fIdelete user script\fR
+\fIdelete printer command\fR
+.TP 0.2i
+\(bu
+\fIdelete share command\fR
.TP 0.2i
\(bu
-\fIdeleteprinter command\fR
+\fIdelete user script\fR
.TP 0.2i
\(bu
\fIdfree command\fR
@@ -584,18 +593,9 @@ each parameter for details. Note that some are synonyms.
\fIdomain admin group\fR
.TP 0.2i
\(bu
-\fIdomain admin users\fR
-.TP 0.2i
-\(bu
-\fIdomain groups\fR
-.TP 0.2i
-\(bu
\fIdomain guest group\fR
.TP 0.2i
\(bu
-\fIdomain guest users\fR
-.TP 0.2i
-\(bu
\fIdomain logons\fR
.TP 0.2i
\(bu
@@ -755,6 +755,9 @@ each parameter for details. Note that some are synonyms.
\fInull passwords\fR
.TP 0.2i
\(bu
+\fIobey pam restrictions\fR
+.TP 0.2i
+\(bu
\fIoplock break wait time\fR
.TP 0.2i
\(bu
@@ -764,6 +767,9 @@ each parameter for details. Note that some are synonyms.
\fIos2 driver map\fR
.TP 0.2i
\(bu
+\fIpam password change\fR
+.TP 0.2i
+\(bu
\fIpanic action\fR
.TP 0.2i
\(bu
@@ -929,9 +935,6 @@ each parameter for details. Note that some are synonyms.
\fIunix password sync\fR
.TP 0.2i
\(bu
-\fIunix realname\fR
-.TP 0.2i
-\(bu
\fIupdate encrypted\fR
.TP 0.2i
\(bu
@@ -1335,48 +1338,7 @@ each parameter for details. Note that some are synonyms.
\fIwriteable\fR
.SH "EXPLANATION OF EACH PARAMETER"
.TP
-\fBadd user script (G)\fR
-This is the full pathname to a script that will
-be run \fBAS ROOT\fR by smbd(8)
-under special circumstances described below.
-
-Normally, a Samba server requires that UNIX users are
-created for all users accessing files on this server. For sites
-that use Windows NT account databases as their primary user database
-creating these users and keeping the user list in sync with the
-Windows NT PDC is an onerous task. This option allows smbdto create the required UNIX users
-\fBON DEMAND\fR when a user accesses the Samba server.
-
-In order to use this option, smbdmust be set to \fIsecurity=server\fR or \fI security=domain\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.
-
-When the Windows user attempts to access the Samba server,
-at login (session setup in the SMB protocol) time, smbdcontacts the \fIpassword server\fR and
-attempts to authenticate the given user with the given password. If the
-authentication succeeds then \fBsmbd\fR
-attempts to find a UNIX user in the UNIX password database to map the
-Windows user into. If this lookup fails, and \fIadd user script
-\fRis set then \fBsmbd\fR will
-call the specified script \fBAS ROOT\fR, expanding
-any \fI%u\fR argument to be the user name to create.
-
-If this script successfully creates the user then \fBsmbd
-\fRwill continue on as though the UNIX user
-already existed. In this way, UNIX users are dynamically created to
-match existing Windows NT accounts.
-
-See also \fI security\fR, \fIpassword server\fR,
-\fIdelete user
-script\fR.
-
-Default: \fBadd user script = <empty string>
-\fR
-Example: \fBadd user script = /usr/local/samba/bin/add_user
-%u\fR
-.TP
-\fBaddprinter command (G)\fR
+\fBadd printer command (G)\fR
With the introduction of MS-RPC based printing
support for Windows NT/2000 clients in Samba 2.2, The MS Add
Printer Wizard (APW) icon is now also available in the
@@ -1385,14 +1347,15 @@ allows for printers to be add remotely to a Samba or Windows
NT/2000 print server.
For a Samba host this means that the printer must be
-physically added to underlying printing system. The \fI addprinter command\fR defines a script to be run which
+physically added to the underlying printing system. The \fIadd
+printer command\fR defines a script to be run which
will perform the necessary operations for adding the printer
to the print system and to add the appropriate service definition
to the \fIsmb.conf\fR file in order that it can be
shared by \fBsmbd(8)\fR
.
-The \fIaddprinter command\fR is
+The \fIadd printer command\fR is
automatically invoked with the following parameter (in
order:
.RS
@@ -1423,13 +1386,13 @@ only. The remaining fields in the structure are generated from answers
to the APW questions.
.PP
.PP
-Once the \fIaddprinter command\fR has
+Once the \fIadd printer command\fR has
been executed, \fBsmbd\fR will reparse the \fI smb.conf\fR to determine if the share defined by the APW
exists. If the sharename is still invalid, then \fBsmbd
\fRwill return an ACCESS_DENIED error to the client.
.PP
.PP
-See also \fI deleteprinter command\fR, \fIprinting\fR,
+See also \fI delete printer command\fR, \fIprinting\fR,
\fIshow add
printer wizard\fR
.PP
@@ -1440,6 +1403,95 @@ Default: \fBnone\fR
Example: \fBaddprinter command = /usr/bin/addprinter
\fR.PP
.TP
+\fBadd share command (G)\fR
+Samba 2.2.0 introduced the ability to dynamically
+add and delete shares via the Windows NT 4.0 Server Manager. The
+\fIadd share command\fR is used to define an
+external program or script which will add a new service definition
+to \fIsmb.conf\fR. In order to successfully
+execute the \fIadd share command\fR, \fBsmbd\fR
+requires that the administrator be connected using a root account (i.e.
+uid == 0).
+
+When executed, \fBsmbd\fR will automatically invoke the
+\fIadd share command\fR with four parameters.
+.RS
+.TP 0.2i
+\(bu
+\fIconfigFile\fR - the location
+of the global \fIsmb.conf\fR file.
+.TP 0.2i
+\(bu
+\fIshareName\fR - the name of the new
+share.
+.TP 0.2i
+\(bu
+\fIpathName\fR - path to an **existing**
+directory on disk.
+.TP 0.2i
+\(bu
+\fIcomment\fR - comment string to associate
+with the new share.
+.RE
+.PP
+This parameter is only used for add file shares. To add printer shares,
+see the \fIadd printer
+command\fR.
+.PP
+.PP
+See also \fIchange share
+command\fR, \fIdelete share
+command\fR.
+.PP
+.PP
+Default: \fBnone\fR
+.PP
+.PP
+Example: \fBadd share command = /usr/local/bin/addshare\fR
+.PP
+.TP
+\fBadd user script (G)\fR
+This is the full pathname to a script that will
+be run \fBAS ROOT\fR by smbd(8)
+under special circumstances described below.
+
+Normally, a Samba server requires that UNIX users are
+created for all users accessing files on this server. For sites
+that use Windows NT account databases as their primary user database
+creating these users and keeping the user list in sync with the
+Windows NT PDC is an onerous task. This option allows smbdto create the required UNIX users
+\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 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.
+
+When the Windows user attempts to access the Samba server,
+at login (session setup in the SMB protocol) time, smbdcontacts the \fIpassword server\fR and
+attempts to authenticate the given user with the given password. If the
+authentication succeeds then \fBsmbd\fR
+attempts to find a UNIX user in the UNIX password database to map the
+Windows user into. If this lookup fails, and \fIadd user script
+\fRis set then \fBsmbd\fR will
+call the specified script \fBAS ROOT\fR, expanding
+any \fI%u\fR argument to be the user name to create.
+
+If this script successfully creates the user then \fBsmbd
+\fRwill continue on as though the UNIX user
+already existed. In this way, UNIX users are dynamically created to
+match existing Windows NT accounts.
+
+See also \fI security\fR, \fIpassword server\fR,
+\fIdelete user
+script\fR.
+
+Default: \fBadd user script = <empty string>
+\fR
+Example: \fBadd user script = /usr/local/samba/bin/add_user
+%u\fR
+.TP
\fBadmin users (S)\fR
This is a list of users who will be granted
administrative privileges on the share. This means that they
@@ -1460,7 +1512,7 @@ Synonym for \fIhosts allow\fR.
This option only takes effect when the \fIsecurity\fR option is set to
server or domain.
If it is set to no, then attempts to connect to a resource from
-a domain or workgroup other than the one which smbd is running
+a domain or workgroup other than the one which smbdis running
in will fail, even if that domain is trusted by the remote server
doing the authentication.
@@ -1477,7 +1529,8 @@ Default: \fBallow trusted domains = yes\fR
.TP
\fBannounce as (G)\fR
This specifies what type of server
-\fBnmbd\fRwill announce itself as, to a network neighborhood browse
+\fBnmbd\fR
+will announce itself as, to a network neighborhood browse
list. By default this is set to Windows NT. The valid options
are : "NT Server" (which can also be written as "NT"),
"NT Workstation", "Win95" or "WfW" meaning Windows NT Server,
@@ -1491,7 +1544,7 @@ Default: \fBannounce as = NT Server\fR
Example: \fBannounce as = Win95\fR
.TP
-\fBannouce version (G)\fR
+\fBannounce version (G)\fR
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
@@ -1514,7 +1567,7 @@ Default: \fBavailable = yes\fR
.TP
\fBbind interfaces only (G)\fR
This global parameter allows the Samba admin
-to limit what interfaces on a machine will serve smb requests. If
+to limit what interfaces on a machine will serve SMB requests. If
affects file service smbd(8)and
name service nmbd(8)in slightly
different ways.
@@ -1536,7 +1589,8 @@ send packets that arrive through any interfaces not listed in the
does defeat this simple check, however so it must not be used
seriously as a security feature for \fBnmbd\fR.
-For file service it causes smbd(8)to bind only to the interface list given in the interfaces parameter. This restricts the networks that
+For file service it causes smbd(8)
+to bind only to the interface list given in the interfaces parameter. This restricts the networks that
\fBsmbd\fR will serve to packets coming in those
interfaces. Note that you should not use this parameter for machines
that are serving PPP or other intermittent or non-broadcast network
@@ -1544,7 +1598,8 @@ interfaces as it will not cope with non-permanent interfaces.
If \fIbind interfaces only\fR is set then
unless the network address \fB127.0.0.1\fR is added
-to the \fIinterfaces\fR parameter list \fBsmbpasswd(8)\fRand \fBswat(8)\fRmay
+to the \fIinterfaces\fR parameter list \fBsmbpasswd(8)\fR
+and \fBswat(8)\fRmay
not work as expected due to the reasons covered below.
To change a users SMB password, the \fBsmbpasswd\fR
@@ -1577,7 +1632,7 @@ cannot be immediately satisfied, Samba 2.2 will internally
queue the lock request, and periodically attempt to obtain
the lock until the timeout period expires.
-If this parameter is set to False, then
+If this parameter is set to false, then
Samba 2.2 will behave as previous versions of Samba would and
will fail the lock request immediately if the lock range
cannot be obtained.
@@ -1624,8 +1679,54 @@ Example: \fBchange notify timeout = 300\fR
Would change the scan time to every 5 minutes.
.TP
+\fBchange share command (G)\fR
+Samba 2.2.0 introduced the ability to dynamically
+add and delete shares via the Windows NT 4.0 Server Manager. The
+\fIchange share command\fR is used to define an
+external program or script which will modify an existing service definition
+in \fIsmb.conf\fR. In order to successfully
+execute the \fIchange share command\fR, \fBsmbd\fR
+requires that the administrator be connected using a root account (i.e.
+uid == 0).
+
+When executed, \fBsmbd\fR will automatically invoke the
+\fIchange share command\fR with four parameters.
+.RS
+.TP 0.2i
+\(bu
+\fIconfigFile\fR - the location
+of the global \fIsmb.conf\fR file.
+.TP 0.2i
+\(bu
+\fIshareName\fR - the name of the new
+share.
+.TP 0.2i
+\(bu
+\fIpathName\fR - path to an **existing**
+directory on disk.
+.TP 0.2i
+\(bu
+\fIcomment\fR - comment string to associate
+with the new share.
+.RE
+.PP
+This parameter is only used modify existing file shares definitions. To modify
+printer shares, use the "Printers..." folder as seen when browsing the Samba host.
+.PP
+.PP
+See also \fIadd share
+command\fR, \fIdelete
+share command\fR.
+.PP
+.PP
+Default: \fBnone\fR
+.PP
+.PP
+Example: \fBchange share command = /usr/local/bin/addshare\fR
+.PP
+.TP
\fBcharacter set (G)\fR
-This allows a smbd to map incoming filenames
+This allows smbdto map incoming filenames
from a DOS Code page (see the client
code page parameter) to several built in UNIX character sets.
The built in code page translations are:
@@ -1696,7 +1797,8 @@ the code page. The default for USA MS-DOS, Windows 95, and
Windows NT releases is code page 437. The default for western
European releases of the above operating systems is code page 850.
-This parameter tells smbd(8)which of the \fIcodepage.XXX
+This parameter tells smbd(8)
+which of the \fIcodepage.XXX
\fRfiles to dynamically load on startup. These files,
described more fully in the manual page \fBmake_smbcodepage(1)\fR, tell \fB smbd\fR how to map lower to upper case characters to provide
the case insensitivity of filenames that Windows clients expect.
@@ -1901,6 +2003,10 @@ create mode\fR parameter for forcing particular mode
bits to be set on created files. See also the \fIdirectory mode"\fR parameter for masking
mode bits on created directories. See also the \fIinherit permissions\fR parameter.
+Note that this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+a mask on access control lists also, they need to set the \fIsecurity mask\fR.
+
Default: \fBcreate mask = 0744\fR
Example: \fBcreate mask = 0775\fR
@@ -1973,15 +2079,7 @@ effect.
Default: \fBdebug uid = no\fR
.TP
\fBdebuglevel (G)\fR
-The value of the parameter (an integer) allows
-the debug level (logging level) to be specified in the
-\fIsmb.conf\fR file. This is to give greater
-flexibility in the configuration of the system.
-
-The default will be the debug level specified on
-the command line or level zero if none was specified.
-
-Example: \fBdebug level = 3\fR
+Synonym for \fI log level\fR.
.TP
\fBdefault (G)\fR
A synonym for \fI default service\fR.
@@ -2025,6 +2123,33 @@ Example:
.sp
.fi
.TP
+\fBdelete printer command (G)\fR
+With the introduction of MS-RPC based printer
+support for Windows NT/2000 clients in Samba 2.2, it is now
+possible to delete printer at run time by issuing the
+DeletePrinter() RPC call.
+
+For a Samba host this means that the printer must be
+physically deleted from underlying printing system. The \fI deleteprinter command\fR defines a script to be run which
+will perform the necessary operations for removing the printer
+from the print system and from \fIsmb.conf\fR.
+
+The \fIdelete printer command\fR is
+automatically called with only one parameter: \fI "printer name"\fR.
+
+Once the \fIdelete printer command\fR has
+been executed, \fBsmbd\fR will reparse the \fI smb.conf\fR to associated printer no longer exists.
+If the sharename is still valid, then \fBsmbd
+\fRwill return an ACCESS_DENIED error to the client.
+
+See also \fI add printer command\fR, \fIprinting\fR,
+\fIshow add
+printer wizard\fR
+
+Default: \fBnone\fR
+
+Example: \fBdeleteprinter command = /usr/bin/removeprinter
+\fR.TP
\fBdelete readonly (S)\fR
This parameter allows readonly files to be deleted.
This is not normal DOS semantics, but is allowed by UNIX.
@@ -2035,6 +2160,45 @@ permissions, and DOS semantics prevent deletion of a read only file.
Default: \fBdelete readonly = no\fR
.TP
+\fBdelete share command (G)\fR
+Samba 2.2.0 introduced the ability to dynamically
+add and delete shares via the Windows NT 4.0 Server Manager. The
+\fIdelete share command\fR is used to define an
+external program or script which will remove an existing service
+definition from \fIsmb.conf\fR. In order to successfully
+execute the \fIdelete share command\fR, \fBsmbd\fR
+requires that the administrator be connected using a root account (i.e.
+uid == 0).
+
+When executed, \fBsmbd\fR will automatically invoke the
+\fIdelete share command\fR with two parameters.
+.RS
+.TP 0.2i
+\(bu
+\fIconfigFile\fR - the location
+of the global \fIsmb.conf\fR file.
+.TP 0.2i
+\(bu
+\fIshareName\fR - the name of
+the existing service.
+.RE
+.PP
+This parameter is only used to remove file shares. To delete printer shares,
+see the \fIdelete printer
+command\fR.
+.PP
+.PP
+See also \fIdelete share
+command\fR, \fIchange
+share\fR.
+.PP
+.PP
+Default: \fBnone\fR
+.PP
+.PP
+Example: \fBdelete share command = /usr/local/bin/delshare\fR
+.PP
+.TP
\fBdelete user script (G)\fR
This is the full pathname to a script that will
be run \fBAS ROOT\fR by \fBsmbd(8)\fRunder special circumstances
@@ -2088,42 +2252,15 @@ Default: \fBdelete user script = <empty string>
Example: \fBdelete user script = /usr/local/samba/bin/del_user
%u\fR
.TP
-\fBdeleteprinter command (G)\fR
-With the introduction of MS-RPC based printer
-support for Windows NT/2000 clients in Samba 2.2, it is now
-possible to delete printer at run time by issuing the
-DeletePrinter() RPC call.
-
-For a Samba host this means that the printer must be
-physically deleted from underlying printing system. The \fI deleteprinter command\fR defines a script to be run which
-will perform the necessary operations for removing the printer
-from the print system and from \fIsmb.conf\fR.
-
-The \fIdeleteprinter command\fR is
-automatically called with only one parameter: \fI "printer name"\fR.
-
-Once the \fIdeleteprinter command\fR has
-been executed, \fBsmbd\fR will reparse the \fI smb.conf\fR to associated printer no longer exists.
-If the sharename is still valid, then \fBsmbd
-\fRwill return an ACCESS_DENIED error to the client.
-
-See also \fI addprinter command\fR, \fIprinting\fR,
-\fIshow add
-printer wizard\fR
-
-Default: \fBnone\fR
-
-Example: \fBdeleteprinter command = /usr/bin/removeprinter
-\fR.TP
\fBdelete veto files (S)\fR
This option is used when Samba is attempting to
delete a directory that contains one or more vetoed directories
(see the \fIveto files\fR
-option). If this option is set to False (the default) then if a vetoed
+option). If this option is set to false (the default) then if a vetoed
directory contains any non-vetoed files or directories then the
directory delete will fail. This is usually what you want.
-If this option is set to True, then Samba
+If this option is set to true, then Samba
will attempt to recursively delete any files and directories within
the vetoed directory. This can be useful for integration with file
serving systems such as NetAtalk which create meta-files within
@@ -2223,6 +2360,10 @@ created from this parameter with the value of the \fIforce directory mode
\fRparameter. This parameter is set to 000 by
default (i.e. no extra mode bits are added).
+Note that this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+a mask on access control lists also, they need to set the \fIdirectory security mask\fR.
+
See the \fIforce
directory mode\fR parameter to cause particular mode
bits to always be set on created directories.
@@ -2253,29 +2394,27 @@ this mask from being modified. Essentially, zero bits in this
mask may be treated as a set of bits the user is not allowed
to change.
-If not set explicitly this parameter is set to the same
-value as the \fIdirectory
-mask\fR parameter. To allow a user to
-modify all the user/group/world permissions on a directory, set
-this parameter to 0777.
+If not set explicitly this parameter is set to 0777
+meaning a user is allowed to modify all the user/group/world
+permissions on a directory.
\fBNote\fR that users who can access the
Samba server through other means can easily bypass this restriction,
so it is primarily useful for standalone "appliance" systems.
-Administrators of most normal systems will probably want to set
-it to 0777.
+Administrators of most normal systems will probably want to leave
+it as the default of 0777.
See also the \fI force directory security mode\fR, \fIsecurity mask\fR,
\fIforce security mode
\fRparameters.
-Default: \fBdirectory security mask = <same as
-directory mask>\fR
+Default: \fBdirectory security mask = 0777\fR
-Example: \fBdirectory security mask = 0777\fR
+Example: \fBdirectory security mask = 0700\fR
.TP
\fBdns proxy (G)\fR
-Specifies that nmbd(8)when acting as a WINS server and finding that a NetBIOS name has not
+Specifies that nmbd(8)
+when acting as a WINS server and finding that a NetBIOS name has not
been registered, should treat the NetBIOS name word-for-word as a DNS
name and do a lookup with the DNS server for that name on behalf of
the name-querying client.
@@ -2293,44 +2432,38 @@ See also the parameter \fI wins support\fR.
Default: \fBdns proxy = yes\fR
.TP
\fBdomain admin group (G)\fR
-This is an \fBEXPERIMENTAL\fR parameter
-that is part of the unfinished Samba NT Domain Controller Code. It may
-be removed in a later release. To work with the latest code builds
-that may have more support for Samba NT Domain Controller functionality
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by
-visiting the web page at http://lists.samba.org/ <URL:http://lists.samba.org/>.
-.TP
-\fBdomain admin users (G)\fR
-This is an \fBEXPERIMENTAL\fR parameter
-that is part of the unfinished Samba NT Domain Controller Code. It may
-be removed in a later release. To work with the latest code builds
-that may have more support for Samba NT Domain Controller functionality
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by
-visiting the web page at http://lists.samba.org/ <URL:http://lists.samba.org/>.
-.TP
-\fBdomain groups (G)\fR
-This is an \fBEXPERIMENTAL\fR parameter
-that is part of the unfinished Samba NT Domain Controller Code. It may
-be removed in a later release. To work with the latest code builds
-that may have more support for Samba NT Domain Controller functionality
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by
-visiting the web page at http://lists.samba.org/ <URL:http://lists.samba.org/>.
+This parameter is intended as a temporary solution
+to enable users to be a member of the "Domain Admins" group when
+a Samba host is acting as a PDC. A complete solution will be provided
+by a system for mapping Windows NT/2000 groups onto UNIX groups.
+Please note that this parameter has a somewhat confusing name. It
+accepts a list of usernames and of group names in standard
+\fIsmb.conf\fR notation.
+
+See also \fIdomain
+guest group\fR, \fIdomain
+logons\fR
+
+Default: \fBno domain administrators\fR
+
+Example: \fBdomain admin group = root @wheel\fR
.TP
\fBdomain guest group (G)\fR
-This is an \fBEXPERIMENTAL\fR parameter
-that is part of the unfinished Samba NT Domain Controller Code. It may
-be removed in a later release. To work with the latest code builds
-that may have more support for Samba NT Domain Controller functionality
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by
-visiting the web page at http://lists.samba.org/ <URL:http://lists.samba.org/>.
-.TP
-\fBdomain guest users (G)\fR
-This is an \fBEXPERIMENTAL\fR parameter
-that is part of the unfinished Samba NT Domain Controller Code. It may
-be removed in a later release. To work with the latest code builds
-that may have more support for Samba NT Domain Controller functionality
-please subscribe to the mailing list samba-ntdom <URL:mailto:samba-ntdom@samba.org> available by
-visiting the web page at http://lists.samba.org/ <URL:http://lists.samba.org/>.
+This parameter is intended as a temporary solution
+to enable users to be a member of the "Domain Guests" group when
+a Samba host is acting as a PDC. A complete solution will be provided
+by a system for mapping Windows NT/2000 groups onto UNIX groups.
+Please note that this parameter has a somewhat confusing name. It
+accepts a list of usernames and of group names in standard
+\fIsmb.conf\fR notation.
+
+See also \fIdomain
+admin group\fR, \fIdomain
+logons\fR
+
+Default: \fBno domain guests\fR
+
+Example: \fBdomain guest group = nobody @guest\fR
.TP
\fBdomain logons (G)\fR
If set to true, the Samba server will serve
@@ -2349,7 +2482,8 @@ claim a special domain specific NetBIOS name that identifies
it as a domain master browser for its given \fIworkgroup\fR. Local master browsers
in the same \fIworkgroup\fR on broadcast-isolated
subnets will give this \fBnmbd\fR their local browse lists,
-and then ask \fBsmbd(8)\fRfor a complete copy of the browse list for the whole wide area
+and then ask \fBsmbd(8)\fR
+for a complete copy of the browse list for the whole wide area
network. Browser clients will then contact their local master browser,
and will receive the domain-wide browse list, instead of just the list
for their broadcast-isolated subnet.
@@ -2390,7 +2524,7 @@ Example: \fBdont descend = /proc,/dev\fR
.TP
\fBdos filemode (S)\fR
The default behavior in Samba is to provide
-UNIX-like behavor where only the owner of a file/directory is
+UNIX-like behavior where only the owner of a file/directory is
able to change the permissions on it. However, this behavior
is often confusing to DOS/Windows users. Enabling this parameter
allows a user who has write access to the file (by whatever
@@ -2429,7 +2563,7 @@ file they can change the timestamp on it. Under POSIX semantics,
only the owner of the file or root may change the timestamp. By
default, Samba runs with POSIX semantics and refuses to change the
timestamp on a file if the user \fBsmbd\fR is acting
-on behalf of is not the file owner. Setting this option to True allows DOS semantics and smbd will change the file
+on behalf of is not the file owner. Setting this option to true allows DOS semantics and smbdwill change the file
timestamp as DOS requires.
Default: \fBdos filetimes = no\fR
@@ -2446,7 +2580,7 @@ In order for encrypted passwords to work correctly
\fBsmbd(8)\fRmust either
have access to a local \fIsmbpasswd(5)
\fRprogram for information on how to set up
-and maintain this file), or set the security=[serve|domain] parameter which
+and maintain this file), or set the security=[server|domain] parameter which
causes \fBsmbd\fR to authenticate against another
server.
@@ -2454,16 +2588,16 @@ Default: \fBencrypt passwords = no\fR
.TP
\fBenhanced browsing (G)\fR
This option enables a couple of enhancements to
-cross-subnet browse propogation that have been added in Samba
+cross-subnet browse propagation that have been added in Samba
but which are not standard in Microsoft implementations.
\fBThese enhancements are currently only available in
the HEAD Samba CVS tree (not Samba 2.2.x).\fR
-The first enhancement to browse propogation consists of a regular
+The first enhancement to browse propagation consists of a regular
wildcard query to a Samba WINS server for all Domain Master Browsers,
-followed by a browse synchronisation with each of the returned
+followed by a browse synchronization with each of the returned
DMBs. The second enhancement consists of a regular randomised browse
-synchronisation with all currently known DMBs.
+synchronization with all currently known DMBs.
You may wish to disable this option if you have a problem with empty
workgroups not disappearing from browse lists. Due to the restrictions
@@ -2471,7 +2605,7 @@ of the browse protocols these enhancements can cause a empty workgroup
to stay around forever which can be annoying.
In general you should leave this option enabled as it makes
-cross-subnet browse propogation much more reliable.
+cross-subnet browse propagation much more reliable.
Default: \fBenhanced browsing = yes\fR
.TP
@@ -2519,7 +2653,7 @@ However, Unix time semantics mean that the create time
reported by Samba will be updated whenever a file is created or
or deleted in the directory. NMAKE finds all object files in
the object directory. The timestamp of the last one built is then
-compared to the timestamp of the object dircetory. If the
+compared to the timestamp of the object directory. If the
directory's timestamp if newer, then all object files
will be rebuilt. Enabling this option
ensures directories always predate their contents and an NMAKE build
@@ -2554,7 +2688,8 @@ Default: \fBfake oplocks = no\fR
.TP
\fBfollow symlinks (S)\fR
This parameter allows the Samba administrator
-to stop \fBsmbd(8)\fRfrom following symbolic links in a particular share. Setting this
+to stop \fBsmbd(8)\fR
+from following symbolic links in a particular share. Setting this
parameter to no prevents any file or directory
that is a symbolic link from being followed (the user will get an
error). This option is very useful to stop users from adding a
@@ -2577,6 +2712,11 @@ permissions changed. The default for this parameter is (in octal)
mode after the mask set in the \fIcreate mask\fR
parameter is applied.
+Note that by default this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+this mask on access control lists also, they need to set the \fIrestrict acl with
+mask\fR to true.
+
See also the parameter \fIcreate
mask\fR for details on masking mode bits on files.
@@ -2601,6 +2741,11 @@ bits to a created directory. This operation is done after the mode
mask in the parameter \fIdirectory mask\fR is
applied.
+Note that by default this parameter does not apply to permissions
+set by Windows NT/2000 ACL editors. If the administrator wishes to enforce
+this mask on access control lists also, they need to set the \fIrestrict acl with
+mask\fR to true.
+
See also the parameter \fI directory mask\fR for details on masking mode bits
on created directories.
@@ -2625,26 +2770,23 @@ the user may have modified to be on. Essentially, one bits in this
mask may be treated as a set of bits that, when modifying security
on a directory, the user has always set to be 'on'.
-If not set explicitly this parameter is set to the same
-value as the \fIforce
-directory mode\fR parameter. To allow
-a user to modify all the user/group/world permissions on a
-directory without restrictions, set this parameter to 000.
+If not set explicitly this parameter is 000, which
+allows a user to modify all the user/group/world permissions on a
+directory without restrictions.
\fBNote\fR that users who can access the
Samba server through other means can easily bypass this restriction,
so it is primarily useful for standalone "appliance" systems.
-Administrators of most normal systems will probably want to set
-it to 0000.
+Administrators of most normal systems will probably want to leave
+it set as 0000.
See also the \fI directory security mask\fR, \fIsecurity mask\fR,
\fIforce security mode
\fRparameters.
-Default: \fBforce directory security mode = <same as
-force directory mode>\fR
+Default: \fBforce directory security mode = 0\fR
-Example: \fBforce directory security mode = 0\fR
+Example: \fBforce directory security mode = 700\fR
.TP
\fBforce group (S)\fR
This specifies a UNIX group name that will be
@@ -2692,26 +2834,23 @@ the user may have modified to be on. Essentially, one bits in this
mask may be treated as a set of bits that, when modifying security
on a file, the user has always set to be 'on'.
-If not set explicitly this parameter is set to the same
-value as the \fIforce
-create mode\fR parameter. To allow a user to
-modify all the user/group/world permissions on a file, with no
-restrictions set this parameter to 000.
+If not set explicitly this parameter is set to 0,
+and allows a user to modify all the user/group/world permissions on a file,
+with no restrictions.
\fBNote\fR that users who can access
the Samba server through other means can easily bypass this restriction,
so it is primarily useful for standalone "appliance" systems.
-Administrators of most normal systems will probably want to set
-it to 0000.
+Administrators of most normal systems will probably want to leave
+this set to 0000.
See also the \fI force directory security mode\fR,
\fIdirectory security
mask\fR, \fI security mask\fR parameters.
-Default: \fBforce security mode = <same as force
-create mode>\fR
+Default: \fBforce security mode = 0\fR
-Example: \fBforce security mode = 0\fR
+Example: \fBforce security mode = 700\fR
.TP
\fBforce user (S)\fR
This specifies a UNIX user name that will be
@@ -2755,7 +2894,7 @@ This is a tuning option. When this is enabled a
caching algorithm will be used to reduce the time taken for getwd()
calls. This can have a significant impact on performance, especially
when the \fIwide links\fR
-parameter is set to False.
+parameter is set to false.
Default: \fBgetwd cache = yes\fR
.TP
@@ -2848,7 +2987,7 @@ Default: \fBhide local users = no\fR
.TP
\fBhomedir map (G)\fR
If\fInis homedir
-\fRis True, and \fBsmbd(8)\fRis also acting
+\fRis true, and \fBsmbd(8)\fRis also acting
as a Win95/98 \fIlogon server\fR then this parameter
specifies the NIS (or YP) map from which the server for the user's
home directory should be extracted. At present, only the Sun
@@ -2958,7 +3097,7 @@ and users who will be allowed access without specifying a password.
This is not be confused with \fIhosts allow\fR which is about hosts
access to services and is more useful for guest services. \fI hosts equiv\fR may be useful for NT clients which will
-not supply passwords to samba.
+not supply passwords to Samba.
\fBNOTE :\fR The use of \fIhosts equiv
\fRcan be a major security hole. This is because you are
@@ -3006,7 +3145,7 @@ Note that the setuid bit is \fBnever\fR set via
inheritance (the code explicitly prohibits this).
This can be particularly useful on large systems with
-many users, perhaps several thousand,to allow a single [homes]
+many users, perhaps several thousand, to allow a single [homes]
share to be used flexibly by each user.
See also \fIcreate mask
@@ -3141,8 +3280,8 @@ and \fIlevel2 oplocks
Default: \fBkernel oplocks = yes\fR
.TP
\fBlanman auth (G)\fR
-This parameter determines whether or not smbd will
-attempt to authentication users using the LANMAN password hash.
+This parameter determines whether or not smbdwill
+attempt to authenticate users using the LANMAN password hash.
If disabled, only clients which support NT password hashes (e.g. Windows
NT/2000 clients, smbclient, etc... but not Windows 95/98 or the MS DOS
network client) will be able to connect to the Samba host.
@@ -3177,7 +3316,7 @@ Currently, if \fIkernel
oplocks\fR are supported then level2 oplocks are
not granted (even if this parameter is set to yes).
Note also, the \fIoplocks\fR
-parameter must be set to "true" on this share in order for
+parameter must be set to true on this share in order for
this parameter to have any effect.
See also the \fIoplocks\fR
@@ -3233,13 +3372,13 @@ Default: \fBload printers = yes\fR
.TP
\fBlocal master (G)\fR
This option allows \fB nmbd(8)\fRto try and become a local master browser
-on a subnet. If set to False then \fB nmbd\fR will not attempt to become a local master browser
+on a subnet. If set to false then \fB nmbd\fR will not attempt to become a local master browser
on a subnet and will also lose in all browsing elections. By
default this value is set to true. Setting this value to true doesn't
mean that Samba will \fBbecome\fR the local master
browser on a subnet, just that \fBnmbd\fR will \fB participate\fR in elections for local master browser.
-Setting this value to False will cause \fBnmbd\fR
+Setting this value to false will cause \fBnmbd\fR
\fBnever\fR to become a local master browser.
Default: \fBlocal master = yes\fR
@@ -3271,7 +3410,7 @@ by the server.
This option \fBmay\fR be useful for read-only
filesystems which \fBmay\fR not need locking (such as
-cdrom drives), although setting this parameter of no
+CDROM drives), although setting this parameter of no
is not really recommended even in this case.
Be careful about disabling locking either globally or in a
@@ -3290,7 +3429,15 @@ you to have separate log files for each user or machine.
Example: \fBlog file = /usr/local/samba/var/log.%m
\fR.TP
\fBlog level (G)\fR
-Synonym for \fI debug level\fR.
+The value of the parameter (an integer) allows
+the debug level (logging level) to be specified in the
+\fIsmb.conf\fR file. This is to give greater
+flexibility in the configuration of the system.
+
+The default will be the log level specified on
+the command line or level zero if none was specified.
+
+Example: \fBlog level = 3\fR
.TP
\fBlogon drive (G)\fR
This parameter specifies the local path to
@@ -3358,7 +3505,7 @@ your Windows NT client.
The share and the path must be readable by the user for
the preferences and directories to be loaded onto the Windows NT
-client. The share must be writeable when the logs in for the first
+client. The share must be writeable when the user logs in for the first
time, in order that the Windows NT client can create the NTuser.dat
and other directories.
@@ -3388,7 +3535,7 @@ Example: \fBlogon path = \\\\PROFILESERVER\\PROFILE\\%U\fR
This parameter specifies the batch file (.bat) or
NT command file (.cmd) to be downloaded and run on a machine when
a user successfully logs in. The file must contain the DOS
-style cr/lf line endings. Using a DOS-style editor to create the
+style CR/LF line endings. Using a DOS-style editor to create the
file is recommended.
The script must be a relative path to the [netlogon]
@@ -3398,7 +3545,7 @@ the file that will be downloaded is:
\fI/usr/local/samba/netlogon/STARTUP.BAT\fR
-The contents of the batch file is entirely your choice. A
+The contents of the batch file are entirely your choice. A
suggested command would be to add \fBNET TIME \\\\SERVER /SET
/YES\fR, to force every machine to synchronize clocks with
the same time server. Another use would be to add \fBNET USE
@@ -3430,7 +3577,7 @@ a printer name and job number to pause the print job. One way
of implementing this is by using job priorities, where jobs
having a too low priority won't be sent to the printer.
-If a \fI%p\fR is given then the printername
+If a \fI%p\fR is given then the printer name
is put in its place. A \fI%j\fR is replaced with
the job number (an integer). On HPUX (see \fIprinting=hpux
\fR), if the \fI-p%p\fR option is added
@@ -3503,7 +3650,7 @@ requesting status information about. To get around this, the
server reports on the first printer service connected to by the
client. This only happens if the connection number sent is invalid.
-If a \fI%p\fR is given then the printername
+If a \fI%p\fR is given then the printer name
is put in its place. Otherwise it is placed at the end of the
command.
@@ -3528,7 +3675,7 @@ a printer name and job number to resume the print job. See
also the \fIlppause command
\fRparameter.
-If a \fI%p\fR is given then the printername
+If a \fI%p\fR is given then the printer name
is put in its place. A \fI%j\fR is replaced with
the job number (an integer).
@@ -3560,7 +3707,7 @@ executed on the server host in order to delete a print job.
This command should be a program or script which takes
a printer name and job number, and deletes the print job.
-If a \fI%p\fR is given then the printername
+If a \fI%p\fR is given then the printer name
is put in its place. A \fI%j\fR is replaced with
the job number (an integer).
@@ -3578,7 +3725,7 @@ Example 1: \fBlprm command = /usr/bin/lprm -P%p %j
Example 2: \fBlprm command = /usr/bin/cancel %p-%j
\fR.TP
\fBmachine password timeout (G)\fR
-If a Samba server is a member of an Windows
+If a Samba server is a member of a Windows
NT Domain (see the security=domain)
parameter) then periodically a running smbd(8)process will try and change the MACHINE ACCOUNT
PASSWORD stored in the TDB called \fIprivate/secrets.tdb
@@ -3612,8 +3759,8 @@ This allows a UNIX script to be sent to the Samba host and
executed on behalf of the connected user.
Scripts executed in this way will be deleted upon
-completion assuming that the user has the appripriate level
-of priviledge and the ile permissions allow the deletion.
+completion assuming that the user has the appropriate level
+of privilege and the file permissions allow the deletion.
If the script generates output, output will be sent to
the file specified by the \fI magic output\fR parameter (see above).
@@ -3638,7 +3785,7 @@ Default: \fBmangle case = no\fR
.TP
\fBmangled map (S)\fR
This is for those who want to directly map UNIX
-file names which can not be represented on Windows/DOS. The mangling
+file names which cannot be represented on Windows/DOS. The mangling
of names is not always what is needed. In particular you may have
documents with file extensions that differ between DOS and UNIX.
For example, under UNIX it is common to use \fI.html\fR
@@ -3651,7 +3798,7 @@ you would use:
\fBmangled map = (*.html *.htm)\fR
One very useful case is to remove the annoying \fI;1
-\fRoff the ends of filenames on some CDROMS (only visible
+\fRoff the ends of filenames on some CDROMs (only visible
under some UNIXes). To do this use a map of (*;1 *;).
Default: \fBno mangled map\fR
@@ -3731,11 +3878,11 @@ or contains upper case characters).
The larger this value, the more likely it is that mangled
names can be successfully converted to correct long UNIX names.
-However, large stack sizes will slow most directory access. Smaller
+However, large stack sizes will slow most directory accesses. Smaller
stacks save memory in the server (each stack element costs 256 bytes).
It is not possible to absolutely guarantee correct long
-file names, so be prepared for some surprises!
+filenames, so be prepared for some surprises!
Default: \fBmangled stack = 50\fR
@@ -3892,7 +4039,7 @@ Example: \fBmax log size = 1000\fR
.TP
\fBmax mux (G)\fR
This option controls the maximum number of
-outstanding simultaneous SMB operations that samba tells the client
+outstanding simultaneous SMB operations that Samba tells the client
it will allow. You should never need to set this parameter.
Default: \fBmax mux = 50\fR
@@ -3965,11 +4112,12 @@ Example: \fBmax protocol = LANMAN1\fR
.TP
\fBmax smbd processes (G)\fR
This parameter limits the maximum number of
-\fBsmbd(8)\fRprocesses concurrently running on a system and is intended
-as a stop gap to prevent degrading service to clients in the event
+\fBsmbd(8)\fR
+processes concurrently running on a system and is intended
+as a stopgap to prevent degrading service to clients in the event
that the server has insufficient resources to handle more than this
number of connections. Remember that under normal operating
-conditions, each user will have an smbd associated with him or her
+conditions, each user will have an smbdassociated with him or her
to handle connections to all shares from a given host.
Default: \fBmax smbd processes = 0\fR ## no limit
@@ -3977,7 +4125,8 @@ Default: \fBmax smbd processes = 0\fR ## no limit
Example: \fBmax smbd processes = 1000\fR
.TP
\fBmax ttl (G)\fR
-This option tells nmbd(8)what the default 'time to live' of NetBIOS names should be (in seconds)
+This option tells nmbd(8)
+what the default 'time to live' of NetBIOS names should be (in seconds)
when \fBnmbd\fR is requesting a name using either a
broadcast packet or from a WINS server. You should never need to
change this parameter. The default is 3 days.
@@ -4023,7 +4172,7 @@ removes it afterwards. \fBNOTE THAT IT IS VERY IMPORTANT
THAT THIS COMMAND RETURN IMMEDIATELY\fR. That's why I
have the '&' on the end. If it doesn't return immediately then
your PCs may freeze when sending messages (they should recover
-after 30secs, hopefully).
+after 30 seconds, hopefully).
All messages are delivered as the global guest user.
The command takes the standard substitutions, although \fI %u\fR won't work (\fI%U\fR may be better
@@ -4124,7 +4273,8 @@ Example : \fBmin protocol = NT1\fR # disable DOS
clients
.TP
\fBmin wins ttl (G)\fR
-This option tells nmbd(8)when acting as a WINS server (\fI wins support = yes\fR) what the minimum 'time to live'
+This option tells nmbd(8)
+when acting as a WINS server (\fI wins support = yes\fR) what the minimum 'time to live'
of NetBIOS names that \fBnmbd\fR will grant will be (in
seconds). You should never need to change this parameter. The default
is 6 hours (21600 seconds).
@@ -4298,6 +4448,18 @@ See also smbpasswd (5).
Default: \fBnull passwords = no\fR
.TP
+\fBobey pam restrictions (G)\fR
+When Samba 2.2 is configured to enable PAM support
+(i.e. --with-pam), this parameter will control whether or not Samba
+should obey PAM's account and session management directives. The
+default behavior is to use PAM for clear text authentication only
+and to ignore any account or session management. Note that Samba
+always ignores PAM for authentication in the case of \fIencrypt passwords = yes\fR
+\&. The reason is that PAM modules cannot support the challenge/response
+authentication mechanism needed in the presence of SMB password encryption.
+
+Default: \fBobey pam restrictions = no\fR
+.TP
\fBonly user (S)\fR
This is a boolean option that controls whether
connections with usernames not in the \fIuser\fR
@@ -4320,18 +4482,6 @@ parameter.
Default: \fBonly user = no\fR
.TP
-\fBole locking compatibility (G)\fR
-This parameter allows an administrator to turn
-off the byte range lock manipulation that is done within Samba to
-give compatibility for OLE applications. Windows OLE applications
-use byte range locking as a form of inter-process communication, by
-locking ranges of bytes around the 2^32 region of a file range. This
-can cause certain UNIX lock managers to crash or otherwise cause
-problems. Setting this parameter to no means you
-trust your UNIX lock manager to handle such cases correctly.
-
-Default: \fBole locking compatibility = yes\fR
-.TP
\fBonly guest (S)\fR
A synonym for \fI guest only\fR.
.TP
@@ -4355,7 +4505,7 @@ smbd(8)tuning option to
improve the efficiency of the granting of oplocks under multiple
client contention for the same file.
-In brief it specifies a number, which causes smbd not to
+In brief it specifies a number, which causes smbdnot to
grant an oplock even when requested if the approximate number of
clients contending for an oplock on the same file goes over this
limit. This causes \fBsmbd\fR to behave in a similar
@@ -4367,7 +4517,7 @@ AND UNDERSTOOD THE SAMBA OPLOCK CODE\fR.
Default: \fBoplock contention limit = 2\fR
.TP
\fBoplocks (S)\fR
-This boolean option tells smbd whether to
+This boolean option tells \fBsmbd\fR whether to
issue oplocks (opportunistic locks) to file open requests on this
share. The oplock code can dramatically (approx. 30% or more) improve
the speed of access to files on Samba servers. It allows the clients
@@ -4392,7 +4542,8 @@ Default: \fBoplocks = yes\fR
\fBos level (G)\fR
This integer value controls what level Samba
advertises itself as for browse elections. The value of this
-parameter determines whether nmbd(8)has a chance of becoming a local master browser for the \fI WORKGROUP\fR in the local broadcast area.
+parameter determines whether nmbd(8)
+has a chance of becoming a local master browser for the \fI WORKGROUP\fR in the local broadcast area.
\fBNote :\fRBy default, Samba will win
a local master browsing election over all Microsoft operating
@@ -4415,7 +4566,7 @@ names to OS/2 printer driver names. The format is:
name>.<device name>
For example, a valid entry using the HP LaserJet 5
-printer driver woudl appear as \fBHP LaserJet 5L = LASERJET.HP
+printer driver would appear as \fBHP LaserJet 5L = LASERJET.HP
LaserJet 5L\fR.
The need for the file is due to the printer driver namespace
@@ -4426,9 +4577,22 @@ containing in the Samba documentation.
Default: \fBos2 driver map = <empty string>
\fR.TP
+\fBpam password change (G)\fR
+With the addition of better PAM support in Samba 2.2,
+this parameter, it is possible to use PAM's password change control
+flag for Samba. If enabled, then PAM will be used for password
+changes when requested by an SMB client insted of the program listed in
+\fIpasswd program\fR.
+It should be possible to enable this without changing your
+\fIpasswd chat\fR
+paramater for most setups.
+
+Default: \fBpam password change = no\fR
+.TP
\fBpanic action (G)\fR
This is a Samba developer option that allows a
-system command to be called when either smbd(8)crashes. This is usually used to draw attention to the fact that
+system command to be called when either smbd(8)
+crashes. This is usually used to draw attention to the fact that
a problem occurred.
Default: \fBpanic action = <empty string>\fR
@@ -4438,7 +4602,7 @@ Example: \fBpanic action = "/bin/sleep 90000"\fR
\fBpasswd chat (G)\fR
This string controls the \fB"chat"\fR
conversation that takes places between smbdand the local password changing
-program to change the users password. The string describes a
+program to change the user's password. The string describes a
sequence of response-receive pairs that smbd(8)uses to determine what to send to the
\fIpasswd program\fR
and what to expect back. If the expected output is not
@@ -4461,8 +4625,8 @@ Double quotes can be used to collect strings with spaces
in them into a single string.
If the send string in any part of the chat sequence
-is a fullstop ".", then no string is sent. Similarly,
-if the expect string is a fullstop then no string is expected.
+is a full stop ".", then no string is sent. Similarly,
+if the expect string is a full stop then no string is expected.
Note that if the \fIunix
password sync\fR parameter is set to true, then this
@@ -4471,8 +4635,13 @@ in the smbpasswd file is being changed, without access to the old
password cleartext. In this case the old password cleartext is set
to "" (the empty string).
+Also, if the \fIpam
+password change\fR parameter is set to true, the chat pairs
+may be matched in any order, and sucess is determined by the PAM result,
+not any particular output. The \\n macro is ignored for PAM conversions.
+
See also \fIunix password
-sync\fR, \fI passwd program\fR and \fIpasswd chat debug\fR.
+sync\fR, \fI passwd program\fR , \fIpasswd chat debug\fR and \fIpam password change\fR.
Default: \fBpasswd chat = *new*password* %n\\n
*new*password* %n\\n *changed*\fR
@@ -4491,10 +4660,12 @@ of 100. This is a dangerous option as it will allow plaintext passwords
to be seen in the \fBsmbd\fR log. It is available to help
Samba admins debug their \fIpasswd chat\fR scripts
when calling the \fIpasswd program\fR and should
-be turned off after this has been done. This parameter is off by
-default.
+be turned off after this has been done. This option has no effect if the
+\fIpam password change\fR
+paramter is set. This parameter is off by default.
-See also <\fIpasswd chat\fR
+See also \fIpasswd chat\fR
+, \fIpam password change\fR
, \fIpasswd program\fR
\&.
@@ -4513,7 +4684,7 @@ of mixed case chars and digits. This can pose a problem as some clients
it.
\fBNote\fR that if the \fIunix
-password sync\fR parameter is set to True
+password sync\fR parameter is set to true
then this program is called \fBAS ROOT\fR
before the SMB password in the smbpasswd(5)
file is changed. If this UNIX password change fails, then
@@ -4524,7 +4695,7 @@ If the \fIunix password sync\fR parameter
is set this parameter \fBMUST USE ABSOLUTE PATHS\fR
for \fBALL\fR programs called, and must be examined
for security implications. Note that by default \fIunix
-password sync\fR is set to False.
+password sync\fR is set to false.
See also \fIunix
password sync\fR.
@@ -4643,7 +4814,7 @@ restriction of the SMB/CIFS protocol when in \fBsecurity=server
If you are using a Windows NT server as your
password server then you will have to ensure that your users
are able to login from the Samba server, as when in \fB security=server\fR mode the network logon will appear to
-come from there rather than from the users workstation.
+come from there rather than from the user's workstation.
.RE
.PP
See also the \fIsecurity
@@ -4685,7 +4856,8 @@ Default: \fBnone\fR
Example: \fBpath = /home/fred\fR
.TP
\fBposix locking (S)\fR
-The \fBsmbd(8)\fRdaemon maintains an database of file locks obtained by SMB clients.
+The \fBsmbd(8)\fR
+daemon maintains an database of file locks obtained by SMB clients.
The default behavior is to map this internal database to POSIX
locks. This means that file locks obtained by SMB clients are
consistent with those seen by POSIX compliant applications accessing
@@ -4700,7 +4872,7 @@ whenever the service is disconnected. It takes the usual
substitutions. The command may be run as the root on some
systems.
-An interesting example may be do unmount server
+An interesting example may be to unmount server
resources:
\fBpostexec = /etc/umount /cdrom\fR
@@ -4715,7 +4887,7 @@ from %m (%I)\\" >> /tmp/log\fR
.TP
\fBpostscript (S)\fR
This parameter forces a printer to interpret
-the print files as postscript. This is done by adding a %!
+the print files as PostScript. This is done by adding a %!
to the start of print output.
This is most useful when you have lots of PCs that persist
@@ -4935,11 +5107,11 @@ Default: \fBprinter admin = <empty string>\fR
Example: \fBprinter admin = admin, @staff\fR
.TP
\fBprinter driver (S)\fR
-\fBNote :\fRThis is a depreciated
+\fBNote :\fRThis is a deprecated
parameter and will be removed in the next major release
following version 2.2. Please see the instructions in
-\fIPRINTER_DRIVER2.txt\fR in the \fIdocs
-\fRof the Samba distribution for more information
+the Samba 2.2. Printing
+HOWTOfor more information
on the new method of loading printer drivers onto a Samba server.
This option allows you to control the string
@@ -4961,11 +5133,11 @@ driver file\fR.
Example: \fBprinter driver = HP LaserJet 4L\fR
.TP
\fBprinter driver file (G)\fR
-\fBNote :\fRThis is a depreciated
+\fBNote :\fRThis is a deprecated
parameter and will be removed in the next major release
following version 2.2. Please see the instructions in
-\fIPRINTER_DRIVER2.txt\fR in the \fIdocs
-\fRof the Samba distribution for more information
+the Samba 2.2. Printing
+HOWTOfor more information
on the new method of loading printer drivers onto a Samba server.
This parameter tells Samba where the printer driver
@@ -4978,7 +5150,7 @@ to be found. If this is not set, the default is :
This file is created from Windows 95 \fImsprint.inf
\fRfiles found on the Windows 95 client system. For more
details on setting up serving of printer drivers to Windows 95
-clients, see the documentation file in the \fIdocs/\fR
+clients, see the outdated documentation file in the \fIdocs/\fR
directory, \fIPRINTER_DRIVER.txt\fR.
See also \fI printer driver location\fR.
@@ -4989,11 +5161,11 @@ Example: \fBprinter driver file =
/usr/local/samba/printers/drivers.def\fR
.TP
\fBprinter driver location (S)\fR
-\fBNote :\fRThis is a depreciated
+\fBNote :\fRThis is a deprecated
parameter and will be removed in the next major release
following version 2.2. Please see the instructions in
-\fIPRINTER_DRIVER2.txt\fR in the \fIdocs
-\fRof the Samba distribution for more information
+the Samba 2.2. Printing
+HOWTOfor more information
on the new method of loading printer drivers onto a Samba server.
This parameter tells clients of a particular printer
@@ -5005,7 +5177,7 @@ to serve printer drivers to Windows 95 machines, this should be set to
Where MACHINE is the NetBIOS name of your Samba server,
and PRINTER$ is a share you set up for serving printer driver
-files. For more details on setting this up see the documentation
+files. For more details on setting this up see the outdated documentation
file in the \fIdocs/\fR directory, \fI PRINTER_DRIVER.txt\fR.
See also \fI printer driver file\fR.
@@ -5037,7 +5209,7 @@ default values for the \fIprint command\fR,
\fIlpq command\fR, \fIlppause command
\fR, \fIlpresume command\fR, and
\fIlprm command\fR if specified in the
-[global]f> section.
+[global] section.
Currently eight printing styles are supported. They are
BSD, AIX,
@@ -5062,17 +5234,17 @@ ok\fR.
.TP
\fBqueuepause command (S)\fR
This parameter specifies the command to be
-executed on the server host in order to pause the printerqueue.
+executed on the server host in order to pause the printer queue.
This command should be a program or script which takes
-a printer name as its only parameter and stops the printerqueue,
+a printer name as its only parameter and stops the printer queue,
such that no longer jobs are submitted to the printer.
This command is not supported by Windows for Workgroups,
-but can be issued from the Printer's window under Windows 95
+but can be issued from the Printers window under Windows 95
and NT.
-If a \fI%p\fR is given then the printername
+If a \fI%p\fR is given then the printer name
is put in its place. Otherwise it is placed at the end of the command.
Note that it is good practice to include the absolute
@@ -5085,19 +5257,19 @@ Example: \fBqueuepause command = disable %p\fR
.TP
\fBqueueresume command (S)\fR
This parameter specifies the command to be
-executed on the server host in order to resume the printerqueue. It
+executed on the server host in order to resume the printer queue. It
is the command to undo the behavior that is caused by the
previous parameter (\fI queuepause command\fR).
This command should be a program or script which takes
-a printer name as its only parameter and resumes the printerqueue,
+a printer name as its only parameter and resumes the printer queue,
such that queued jobs are resubmitted to the printer.
This command is not supported by Windows for Workgroups,
-but can be issued from the Printer's window under Windows 95
+but can be issued from the Printers window under Windows 95
and NT.
-If a \fI%p\fR is given then the printername
+If a \fI%p\fR is given then the printer name
is put in its place. Otherwise it is placed at the end of the
command.
@@ -5189,7 +5361,7 @@ For example:
\fBremote announce = 192.168.2.255/SERVERS
192.168.4.255/STAFF\fR
-the above line would cause nmbd to announce itself
+the above line would cause \fBnmbd\fR to announce itself
to the two given IP addresses using the given workgroup names.
If you leave out the workgroup name then the one given in
the \fIworkgroup\fR
@@ -5206,10 +5378,10 @@ Default: \fBremote announce = <empty string>
\fR.TP
\fBremote browse sync (G)\fR
This option allows you to setup nmbd(8)to periodically request
-synchronization of browse lists with the master browser of a samba
+synchronization of browse lists with the master browser of a Samba
server that is on a remote segment. This option will allow you to
gain browse lists for multiple workgroups across routed networks. This
-is done in a manner that does not work with any non-samba servers.
+is done in a manner that does not work with any non-Samba servers.
This is useful if you want your Samba server and all local
clients to appear in a remote workgroup for which the normal browse
@@ -5229,10 +5401,31 @@ addresses of the remote networks, but can also be the IP addresses
of known browse masters if your network config is that stable. If
a machine IP address is given Samba makes NO attempt to validate
that the remote machine is available, is listening, nor that it
-is in fact the browse master on it's segment.
+is in fact the browse master on its segment.
Default: \fBremote browse sync = <empty string>
\fR.TP
+\fBrestrict acl with mask (S)\fR
+This is a boolean parameter. If set to false (default), then
+creation of files with access control lists (ACLS) and modification of ACLs
+using the Windows NT/2000 ACL editor will be applied directly to the file
+or directory.
+
+If set to true, then all requests to set an ACL on a file will have the
+parameters \fIcreate mask\fR,
+\fIforce create mode\fR
+applied before setting the ACL, and all requests to set an ACL on a directory will
+have the parameters \fIdirectory
+mask\fR, \fIforce
+directory mode\fR applied before setting the ACL.
+
+See also \fIcreate mask\fR,
+\fIforce create mode\fR,
+\fIdirectory mask\fR,
+\fIforce directory mode\fR
+
+Default: \fBrestrict acl with mask = no\fR
+.TP
\fBrestrict anonymous (G)\fR
This is a boolean parameter. If it is true, then
anonymous access to the server will be restricted, namely in the
@@ -5249,8 +5442,8 @@ and this is a way to work around that.
When restrict anonymous is true, all anonymous connections
are denied no matter what they are for. This can effect the ability
-of a machine to access the samba Primary Domain Controller to revalidate
-it's machine account after someone else has logged on the client
+of a machine to access the Samba Primary Domain Controller to revalidate
+its machine account after someone else has logged on the client
interactively. The NT client will display a message saying that
the machine's account in the domain doesn't exist or the password is
bad. The best way to deal with this is to reboot NT client machines
@@ -5267,7 +5460,7 @@ Synonym for \fIroot directory"\fR.
.TP
\fBroot directory (G)\fR
The server will \fBchroot()\fR (i.e.
-Change it's root directory) to this directory on startup. This is
+Change its root directory) to this directory on startup. This is
not strictly necessary for secure operation. Even without it the
server will deny access to files not in one of the service entries.
It may also check for, and deny access to, soft links to other
@@ -5296,7 +5489,7 @@ Example: \fBroot directory = /homes/smb\fR
This is the same as the \fIpostexec\fR
parameter except that the command is run as root. This
is useful for unmounting filesystems
-(such as cdroms) after a connection is closed.
+(such as CDROMs) after a connection is closed.
See also \fI postexec\fR.
@@ -5305,8 +5498,8 @@ Default: \fBroot postexec = <empty string>
\fBroot preexec (S)\fR
This is the same as the \fIpreexec\fR
parameter except that the command is run as root. This
-is useful for mounting filesystems (such as cdroms) after a
-connection is closed.
+is useful for mounting filesystems (such as CDROMs) when a
+connection is opened.
See also \fI preexec\fR and \fIpreexec close\fR.
@@ -5369,7 +5562,7 @@ The different settings will now be explained.
\fBSECURITY = SHARE
\fR
-When clients connect to a share level security server then
+When clients connect to a share level security server they
need not log onto the server with a valid username and password before
attempting to connect to a shared resource (although modern clients
such as Windows 95/98 and Windows NT will send a logon request with
@@ -5438,7 +5631,7 @@ be used in granting access.
See also the section NOTE ABOUT USERNAME/PASSWORD VALIDATION.
.PP
.PP
-\fBSECURIYT = USER
+\fBSECURITY = USER
\fR.PP
.PP
This is the default security setting in Samba 2.2.
@@ -5476,7 +5669,7 @@ documentation file in the \fIdocs/\fR directory
up.
.PP
.PP
-\fBNote\fR that from the clients point of
+\fBNote\fR that from the client's point of
view \fBsecurity = server\fR is the same as \fB security = user\fR. It only affects how the server deals
with the authentication, it does not in any way affect what the
client sees.
@@ -5515,7 +5708,7 @@ exist as well as the account on the Domain Controller to allow
Samba to have a valid UNIX account to map file access to.
.PP
.PP
-\fBNote\fR that from the clients point
+\fBNote\fR that from the client's point
of view \fBsecurity = domain\fR is the same as \fBsecurity = user
\fR\&. It only affects how the server deals with the authentication,
it does not in any way affect what the client sees.
@@ -5565,30 +5758,27 @@ this mask from being modified. Essentially, zero bits in this
mask may be treated as a set of bits the user is not allowed
to change.
-If not set explicitly this parameter is set to the same
-value as the \fIcreate mask
-\fRparameter. To allow a user to modify all the
-user/group/world permissions on a file, set this parameter to
-0777.
+If not set explicitly this parameter is 0777, allowing
+a user to modify all the user/group/world permissions on a file.
\fBNote\fR that users who can access the
Samba server through other means can easily bypass this
restriction, so it is primarily useful for standalone
"appliance" systems. Administrators of most normal systems will
-probably want to set it to 0777.
+probably want to leave it set to 0777.
See also the \fIforce directory security mode\fR,
\fIdirectory
security mask\fR, \fIforce security mode\fR parameters.
-Default: \fBsecurity mask = <same as create mask>
-\fR
-Example: \fBsecurity mask = 0777\fR
+Default: \fBsecurity mask = 0777\fR
+
+Example: \fBsecurity mask = 0770\fR
.TP
\fBserver string (G)\fR
This controls what string will show up in the
printer comment box in print manager and next to the IPC connection
-in \fBnet view"\fR. It can be any string that you wish
+in \fBnet view\fR. It can be any string that you wish
to show to your users.
It also sets what will appear in browse lists next
@@ -5665,7 +5855,7 @@ open a handle on the printer server with OpenPrinterEx() asking for
Administrator privileges. If the user does not have administrative
access on the print server (i.e is not root or a member of the
\fIprinter admin\fR group), the OpenPrinterEx()
-call fails and the clients another open call with a request for
+call fails and the client makes another open call with a request for
a lower privilege level. This should succeed, however the APW
icon will not be displayed.
@@ -5694,7 +5884,7 @@ address Samba will listen for connections on. This is used to
support multiple virtual interfaces on the one server, each
with a different configuration.
-By default samba will accept connections on any
+By default Samba will accept connections on any
address.
Example: \fBsocket address = 192.168.2.20\fR
@@ -5831,8 +6021,8 @@ this code is \fBNOT\fR enabled by default in any
current binary version of Samba.
This variable enables or disables the entire SSL mode. If
-it is set to no, the SSL enabled samba behaves
-exactly like the non-SSL samba. If set to yes,
+it is set to no, the SSL-enabled Samba behaves
+exactly like the non-SSL Samba. If set to yes,
it depends on the variables \fI ssl hosts\fR and \fIssl hosts resign\fR whether an SSL
connection will be required.
@@ -5850,7 +6040,7 @@ current binary version of Samba.
This variable defines where to look up the Certification
Authorities. The given directory should contain one file for
-each CA that samba will trust. The file name must be the hash
+each CA that Samba will trust. The file name must be the hash
value over the "Distinguished Name" of the CA. How this directory
is set up is explained later in this document. All files within the
directory that don't fit into this naming scheme are ignored. You
@@ -5953,12 +6143,12 @@ given at configure time.
this code is \fBNOT\fR enabled by default in any
current binary version of Samba.
-These two variables define whether samba will go
-into SSL mode or not. If none of them is defined, samba will
+These two variables define whether Samba will go
+into SSL mode or not. If none of them is defined, Samba will
allow only SSL connections. If the \fIssl hosts\fR variable lists
hosts (by IP-address, IP-address range, net group or name),
only these hosts will be forced into SSL mode. If the \fI ssl hosts resign\fR variable lists hosts, only these
-hosts will NOT be forced into SSL mode. The syntax for these two
+hosts will \fBNOT\fR be forced into SSL mode. The syntax for these two
variables is the same as for the \fI hosts allow\fR and \fIhosts deny\fR pair of variables, only
that the subject of the decision is different: It's not the access
right but whether SSL is used or not.
@@ -6087,7 +6277,8 @@ Default: \fBstat cache size = 50\fR
.TP
\fBstatus (G)\fR
This enables or disables logging of connections
-to a status file that smbstatus(1)can read.
+to a status file that smbstatus(1)
+can read.
With this disabled \fBsmbstatus\fR won't be able
to tell you what connections are active. You should never need to
@@ -6104,7 +6295,7 @@ deny access if locks exist. This can be slow on some systems.
When strict locking is no the server does file
lock checks only when the client explicitly asks for them.
-Well behaved clients always ask for lock checks when it
+Well-behaved clients always ask for lock checks when it
is important, so in the vast majority of cases \fBstrict
locking = no\fR is preferable.
@@ -6118,7 +6309,7 @@ the process to be suspended until the kernel has ensured that
all outstanding data in kernel disk buffers has been safely stored
onto stable storage. This is very slow and should only be done
rarely. Setting this parameter to no (the
-default) means that smbd ignores the Windows applications requests for
+default) means that smbdignores the Windows applications requests for
a sync call. There is only a possibility of losing data if the
operating system itself that Samba is running on crashes, so there is
little danger in this default setting. In addition, this fixes many
@@ -6223,7 +6414,7 @@ Synonym for \fI debug timestamp\fR.
This parameter accepts an integer value which defines
a limit on the maximum number of print jobs that will be accepted
system wide at any given time. If a print job is submitted
-by a client which will exceed this number, then smbd will return an
+by a client which will exceed this number, then smbdwill return an
error indicating that no space is available on the server. The
default value of 0 means that no such limit exists. This parameter
can be used to prevent a server from exceeding its capacity and is
@@ -6241,7 +6432,7 @@ when the encrypted SMB password in the smbpasswd file is changed.
If this is set to true the program specified in the \fIpasswd
program\fRparameter is called \fBAS ROOT\fR -
to allow the new UNIX password to be set without access to the
-old UNIX password (as the SMB password has change code has no
+old UNIX password (as the SMB password change code has no
access to the old password cleartext, only the new).
See also \fIpasswd
@@ -6249,14 +6440,6 @@ program\fR, \fI passwd chat\fR.
Default: \fBunix password sync = no\fR
.TP
-\fBunix realname (G)\fR
-This boolean parameter when set causes samba
-to supply the real name field from the unix password file to
-the client. This is useful for setting up mail clients and WWW
-browsers on systems used by more than one person.
-
-Default: \fBunix realname = yes\fR
-.TP
\fBupdate encrypted (G)\fR
This boolean parameter allows a user logging
on with a plaintext password to have their encrypted (hashed)
@@ -6284,8 +6467,8 @@ password in order to connect correctly, and to update their hashed
Default: \fBupdate encrypted = no\fR
.TP
\fBuse rhosts (G)\fR
-If this global parameter is a true, it specifies
-that the UNIX users \fI.rhosts\fR file in their home directory
+If this global parameter is true, it specifies
+that the UNIX user's \fI.rhosts\fR file in their home directory
will be read to find the names of hosts and users who will be allowed
access without specifying a password.
@@ -6335,7 +6518,7 @@ can use the \fIvalid users
\fRparameter.
If any of the usernames begin with a '@' then the name
-will be looked up first in the yp netgroups list (if Samba
+will be looked up first in the NIS netgroups list (if Samba
is compiled with netgroup support), followed by a lookup in
the UNIX groups database and will expand to a list of all users
in the group of that name.
@@ -6345,7 +6528,7 @@ will be looked up only in the UNIX groups database and will
expand to a list of all users in the group of that name.
If any of the usernames begin with a '&'then the name
-will be looked up only in the yp netgroups database (if Samba
+will be looked up only in the NIS netgroups database (if Samba
is compiled with netgroup support) and will expand to a list
of all users in the netgroup group of that name.
@@ -6471,7 +6654,7 @@ Example: \fBusername map = /usr/local/samba/lib/users.map
\fR.TP
\fButmp (S)\fR
This boolean parameter is only available if
-Samba has been configured and compiled with the option \fB --with-utmp\fR. If set to True then Samba will attempt
+Samba has been configured and compiled with the option \fB --with-utmp\fR. If set to true then Samba will attempt
to add utmp or utmpx records (depending on the UNIX system) whenever a
connection is made to a Samba server. Sites may use this to record the
user connecting to a Samba share.
@@ -6645,7 +6828,7 @@ Default : \fBno value\fR
.TP
\fBvfs options (S)\fR
This parameter allows parameters to be passed
-to the vfs layer at initialisation time. The Samba VFS layer
+to the vfs layer at initialization time. The Samba VFS layer
is new to Samba 2.2 and must be enabled at compile time
with --with-vfs. See also \fI vfs object\fR.
@@ -6688,7 +6871,7 @@ available in Samba 3.0.
The winbind gid parameter specifies the range of group
ids that are allocated by the winbindd(8)daemon. This range of group ids should have no
-existing local or nis groups within it as strange conflicts can
+existing local or NIS groups within it as strange conflicts can
occur otherwise.
Default: \fBwinbind gid = <empty string>
@@ -6715,7 +6898,7 @@ available in Samba 3.0.
The winbind gid parameter specifies the range of group
ids that are allocated by the winbindd(8)daemon. This range of ids should have no
-existing local or nis users within it as strange conflicts can
+existing local or NIS users within it as strange conflicts can
occur otherwise.
Default: \fBwinbind uid = <empty string>
@@ -6744,13 +6927,13 @@ name has not previously been added, in that case it should be treated
as an add.
.TP 0.2i
\(bu
-The second argument is the netbios name. If the
+The second argument is the NetBIOS name. If the
name is not a legal name then the wins hook is not called.
Legal names contain only letters, digits, hyphens, underscores
and periods.
.TP 0.2i
\(bu
-The third argument is the netbios name
+The third argument is the NetBIOS name
type as a 2 digit hexadecimal number.
.TP 0.2i
\(bu
@@ -6799,7 +6982,7 @@ This boolean controls if the
nmbd(8)process in Samba will act as a WINS server. You should
not set this to true unless you have a multi-subnetted network and
you wish a particular \fBnmbd\fR to be your WINS server.
-Note that you should \fBNEVER\fR set this to true
+Note that you should \fBNEVER\fR set this to true
on more than one machine in your network.
Default: \fBwins support = no\fR
@@ -6829,7 +7012,7 @@ Reads for the file are also served from this cache if the data is stored
within it.
This cache allows Samba to batch client writes into a more
-efficient write size for RAID disks (ie. writes may be tuned to
+efficient write size for RAID disks (i.e. writes may be tuned to
be the RAID stripe size) and can improve performance on systems
where the disk subsystem is a bottleneck but there is free
memory for userspace programs.
@@ -6865,7 +7048,7 @@ Synonym for \fI writeable\fR.
.TP
\fBwrite raw (G)\fR
This parameter controls whether or not the server
-will support raw writes SMB's when transferring data from clients.
+will support raw write SMB's when transferring data from clients.
You should never need to change this parameter.
Default: \fBwrite raw = yes\fR
@@ -6915,7 +7098,8 @@ samba(7),
\fBsmbclient(1)\fR,
\fBnmblookup(1)\fR,
\fBtestparm(1)\fR,
-\fBtestprns(1)\fR.SH "AUTHOR"
+\fBtestprns(1)\fR
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1
index 9322d1aa8ef..882a7e5e0e5 100644
--- a/docs/manpages/smbcacls.1
+++ b/docs/manpages/smbcacls.1
@@ -3,21 +3,21 @@
.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/>
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH SMBCACLS 1 "23 Jun 2001" "smbcacls 2.2.0a"
+.TH "SMBCACLS" "1" "22 June 2001" "" ""
.SH NAME
smbcacls \- Set or get ACLs on an NT file or directory names
.SH SYNOPSIS
.sp
-\fBnmblookup\fR \fB//server/share\fR \fBfilename\fR [ \fB-U username\fR ] [ \fB-A acls\fR ] [ \fB-M acls\fR ] [ \fB-D acls\fR ] [ \fB-S acls\fR ] [ \fB-C name\fR ] [ \fB-G name\fR ] [ \fB-n\fR ] [ \fB-h\fR ]
+\fBsmbcacls\fR \fB//server/share\fR \fBfilename\fR [ \fB-U username\fR ] [ \fB-A acls\fR ] [ \fB-M acls\fR ] [ \fB-D acls\fR ] [ \fB-S acls\fR ] [ \fB-C name\fR ] [ \fB-G name\fR ] [ \fB-n\fR ] [ \fB-h\fR ]
.SH "DESCRIPTION"
.PP
This tool is part of the Sambasuite.
.PP
-The smbcacls program manipulates NT Access Control Lists
+The \fBsmbcacls\fR program manipulates NT Access Control Lists
(ACLs) on SMB file shares.
.SH "OPTIONS"
.PP
-The following options are available to the smbcacls program.
+The following options are available to the \fBsmbcacls\fR program.
The format of ACLs is described in the section ACL FORMAT
.TP
\fB-A acls\fR
@@ -30,7 +30,7 @@ specified on the command line. An error will be printed for each
ACL specified that was not already present in the ACL list
.TP
\fB-D acls\fR
-Delete any ACLs specfied on the command line.
+Delete any ACLs specified on the command line.
An error will be printed for each ACL specified that was not
already present in the ACL list.
.TP
@@ -168,8 +168,8 @@ The \fBsmbcacls\fR program sets the exit status
depending on the success or otherwise of the operations performed.
The exit status may be one of the following values.
.PP
-If the operation succeded, smbcacls returns and exit
-status of 0. If smbcacls couldn't connect to the specified server,
+If the operation succeeded, smbcacls returns and exit
+status of 0. If \fBsmbcacls\fR couldn't connect to the specified server,
or there was an error getting or setting the ACLs, an exit status
of 1 is returned. If there was an error parsing any command line
arguments, an exit status of 2 is returned.
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index f75ac743c53..59a2df21b9c 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -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 SMBCLIENT 1 "23 Jun 2001" "smbclient 2.2.0a"
+.TH "SMBCLIENT" "1" "22 June 2001" "" ""
.SH NAME
smbclient \- ftp-like client to access SMB/CIFS resources on servers
.SH SYNOPSIS
@@ -38,8 +38,8 @@ a NetBIOS server name, which may or may not be the
same as the IP hostname of the machine running the server.
The server name is looked up according to either
-the \fI-R\fR parameter to smbclient or
-using the name resolve order parameter in the smb.conf file,
+the \fI-R\fR parameter to \fBsmbclient\fR or
+using the name resolve order parameter in the \fIsmb.conf\fR file,
allowing an administrator to change the order and methods
by which server names are looked up.
.TP
@@ -75,7 +75,7 @@ options.
\fB-R <name resolve order>\fR
This option is used by the programs in the Samba
suite to determine what naming services and in what order to resolve
-host names to IP addresses. The option takes a space separated
+host names to IP addresses. The option takes a space-separated
string of different name resolution options.
The options are :"lmhosts", "host", "wins" and "bcast". They
@@ -92,7 +92,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
@@ -120,7 +120,7 @@ defined in the \fIsmb.conf\fR file parameter
.PP
The default order is lmhosts, host, wins, bcast and without
this parameter or any entry in the \fIname resolve order
-\fRparameter of the smb.conf file the name resolution
+\fRparameter of the \fIsmb.conf\fR file the name resolution
methods will be attempted in this order.
.PP
.TP
@@ -157,7 +157,7 @@ messages.
\fB-i scope\fR
This specifies a NetBIOS scope that smbclient will
use to communicate with when generating NetBIOS names. For details
-on the use of NetBIOS scopes, see rfc1001.txt and rfc1002.txt.
+on the use of NetBIOS scopes, see \fIrfc1001.txt\fR and \fIrfc1002.txt\fR.
NetBIOS scopes are \fBvery\fR rarely used, only set
this parameter if you are the system administrator in charge of all
the NetBIOS systems you communicate with.
@@ -178,7 +178,7 @@ allows you to override the host name and use whatever NetBIOS
name you wish.
.TP
\fB-d debuglevel\fR
-debuglevel is an integer from 0 to 10, or
+\fIdebuglevel\fR is an integer from 0 to 10, or
the letter 'A'.
The default value if this parameter is not specified
@@ -195,13 +195,13 @@ 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. If debuglevel is set to the letter 'A', then \fBall
+cryptic. If \fIdebuglevel\fR is set to the letter 'A', then \fBall
\fRdebug messages will be printed. This setting
is for developers only (and people who \fBreally\fR want
to know how the code works internally).
Note that specifying this parameter here will override
-the log level parameter in the \fBsmb.conf (5)\fR
+the log level parameter in the \fIsmb.conf (5)\fR
file.
.TP
\fB-p port\fR
@@ -211,7 +211,7 @@ TCP port number for an SMB/CIFS server is 139, which is the
default.
.TP
\fB-l logfilename\fR
-If specified, logfilename specifies a base filename
+If specified, \fIlogfilename\fR specifies a base filename
into which operational data from the running client will be
logged.
@@ -227,7 +227,7 @@ The log file generated is never removed by the client.
Print the usage message for the client.
.TP
\fB-I IP-address\fR
-IP address is the address of the server to connect to.
+\fIIP address\fR is the address of the server to connect to.
It should be specified in standard "a.b.c.d" notation.
Normally the client would attempt to locate a named
@@ -253,28 +253,28 @@ By default, the client writes messages to standard output
\fB-U username[%pass]\fR
Sets the SMB username or username and password.
If %pass is not specified, The user will be prompted. The client
-will first check the USER environment variable, then the
-\fI$LOGNAME\fR variable and if either exist, the
+will first check the \fBUSER\fR environment variable, then the
+\fBLOGNAME\fR variable and if either exists, the
string is uppercased. Anything in these variables following a '%'
-sign will be treated as the password. If these environmental
+sign will be treated as the password. If these environment
variables are not found, the username GUEST
is used.
-If the password is not included in these environment
-variables (using the %pass syntax), rpcclient will look for
-a \fI$PASSWD\fR environment variable from which
+If the password is not included in these environment
+variables (using the %pass syntax), \fBrpcclient\fR will look for
+a \fBPASSWD\fR environment variable from which
to read the password.
A third option is to use a credentials file which
contains the plaintext of the username and password. This
option is mainly provided for scripts where the admin doesn't
-desire to pass the credentials on the command line or via environment
+wish to pass the credentials on the command line or via environment
variables. If this method is used, make certain that the permissions
on the file restrict access from unwanted users. See the
\fI-A\fR for more details.
Be cautious about including passwords in scripts or in
-the \fI$PASSWD\fR environment variable. Also, on
+the \fBPASSWD\fR environment variable. Also, on
many systems the command line of a running process may be seen
via the \fBps\fR command to be safe always allow
\fBrpcclient\fR to prompt for a password and type
@@ -301,11 +301,11 @@ This option allows you to look at what services
are available on a server. You use it as \fBsmbclient -L
host\fR and a list should appear. The \fI-I
\fRoption may be useful if your NetBIOS names don't
-match your tcp/ip dns host names or if you are trying to reach a
+match your TCP/IP DNS host names or if you are trying to reach a
host on another network.
.TP
\fB-t terminal code\fR
-This option tells smbclient how to interpret
+This option tells \fBsmbclient\fR how to interpret
filenames coming from the remote server. Usually Asian language
multibyte UNIX implementations use different character sets than
SMB/CIFS servers (\fBEUC\fR instead of \fB SJIS\fR for example). Setting this parameter will let
@@ -383,7 +383,7 @@ diagnostics as it works. This is the same as tarmode quiet.
.TP 0.2i
\(bu
\fIr\fR - Regular expression include
-or exclude. Uses regular regular expression matching for
+or exclude. Uses regular expression matching for
excluding or excluding files if compiled with HAVE_REGEX_H.
However this mode can be very slow. If not compiled with
HAVE_REGEX_H, does a limited wildcard match on '*' and '?'.
@@ -407,7 +407,7 @@ archive bit to be reset when a file is backed up. Useful with the
\fBsmbclient\fR's tar option now supports long
file names both on backup and restore. However, the full path
name of the file must be less than 1024 bytes. Also, when
-a tar archive is created, smbclient's tar option places all
+a tar archive is created, \fBsmbclient\fR's tar option places all
files in the archive with relative names, not absolute names.
.PP
.PP
@@ -422,11 +422,11 @@ the component separator).
\fBExamples\fR
.PP
.PP
-Restore from tar file backup.tar into myshare on mypc
+Restore from tar file \fIbackup.tar\fR into myshare on mypc
(no password on share).
.PP
.PP
-\fBsmbclient //mypc/myshare "" -N -Tx backup.tar
+\fBsmbclient //mypc/yshare "" -N -Tx backup.tar
\fR.PP
.PP
Restore everything except \fIusers/docs\fR
@@ -463,7 +463,7 @@ Change to initial directory before starting. Probably
only of any use with the tar -T option.
.TP
\fB-c command string\fR
-command string is a semicolon separated list of
+command string is a semicolon-separated list of
commands to be executed instead of prompting from stdin. \fI -N\fR is implied by \fI-c\fR.
This is particularly useful in scripts and for printing stdin
@@ -500,13 +500,13 @@ vary from server to server, depending on how the server was implemented.
The commands available are given here in alphabetical order.
.TP
\fB? [command]\fR
-If "command" is specified, the ? command will display
+If \fIcommand\fR is specified, the ? command will display
a brief informative message about the specified command. If no
command is specified, a list of available commands will
be displayed.
.TP
\fB! [shell command]\fR
-If "shell command" is specified, the !
+If \fIshell command\fR is specified, the !
command will execute a shell locally and run the specified shell
command. If no command is specified, a local shell will be run.
.TP
@@ -521,11 +521,11 @@ directory on the server will be reported.
.TP
\fBdel <mask>\fR
The client will request that the server attempt
-to delete all files matching "mask" from the current working
+to delete all files matching \fImask\fR from the current working
directory on the server.
.TP
\fBdir <mask>\fR
-A list of the files matching "mask" in the current
+A list of the files matching \fImask\fR in the current
working directory on the server will be retrieved from the server
and displayed.
.TP
@@ -534,9 +534,9 @@ Terminate the connection with the server and exit
from the program.
.TP
\fBget <remote file name> [local file name]\fR
-Copy the file called "remote file name" from
+Copy the file called \fIremote file name\fR from
the server to the machine running the client. If specified, name
-the local copy "local file name". Note that all transfers in
+the local copy \fIlocal file name\fR. Note that all transfers in
\fBsmbclient\fR are binary. See also the
lowercase command.
.TP
@@ -544,7 +544,7 @@ lowercase command.
See the ? command above.
.TP
\fBlcd [directory name]\fR
-If "directory name" is specified, the current
+If \fIdirectory name\fR is specified, the current
working directory on the local machine will be changed to
the directory specified. This operation will fail if for any
reason the specified directory is inaccessible.
@@ -591,26 +591,26 @@ mask back to "*" after using the mget or mput commands.
See the mkdir command.
.TP
\fBmget <mask>\fR
-Copy all files matching mask from the server to
+Copy all files matching \fImask\fR from the server to
the machine running the client.
-Note that mask is interpreted differently during recursive
+Note that \fImask\fR is interpreted differently during recursive
operation and non-recursive operation - refer to the recurse and
mask commands for more information. Note that all transfers in
-smbclient are binary. See also the lowercase command.
+\fBsmbclient\fR are binary. See also the lowercase command.
.TP
\fBmkdir <directory name>\fR
Create a new directory on the server (user access
privileges permitting) with the specified name.
.TP
\fBmput <mask>\fR
-Copy all files matching mask in the current working
+Copy all files matching \fImask\fR in the current working
directory on the local machine to the current working directory on
the server.
-Note that mask is interpreted differently during recursive
+Note that \fImask\fR is interpreted differently during recursive
operation and non-recursive operation - refer to the recurse and mask
-commands for more information. Note that all transfers in smbclient
+commands for more information. Note that all transfers in \fBsmbclient\fR
are binary.
.TP
\fBprint <file name>\fR
@@ -633,10 +633,10 @@ the transfer of each file during these commands. When toggled
OFF, all specified files will be transferred without prompting.
.TP
\fBput <local file name> [remote file name]\fR
-Copy the file called "local file name" from the
+Copy the file called \fIlocal file name\fR from the
machine running the client to the server. If specified,
-name the remote copy "remote file name". Note that all transfers
-in smbclient are binary. See also the lowercase command.
+name the remote copy \fIremote file name\fR. Note that all transfers
+in \fBsmbclient\fR are binary. See also the lowercase command.
.TP
\fBqueue\fR
Displays the print queue, showing the job id,
@@ -664,7 +664,7 @@ to the mget or mput commands will be copied, and any mask specified
using the mask command will be ignored.
.TP
\fBrm <mask>\fR
-Remove all files matching mask from the current
+Remove all files matching \fImask\fR from the current
working directory on the server.
.TP
\fBrmdir <directory name>\fR
@@ -681,7 +681,7 @@ with tar x may not work - use the command line option instead.
\fBblocksize <blocksize>\fR
Blocksize. Must be followed by a valid (greater
than zero) blocksize. Causes tar file to be written out in
-blocksize*TBLOCK (usually 512 byte) blocks.
+\fIblocksize\fR*TBLOCK (usually 512 byte) blocks.
.TP
\fBtarmode <full|inc|reset|noreset>\fR
Changes tar's behavior with regard to archive
@@ -713,12 +713,12 @@ smbclient supports long file names where the server
supports the LANMAN2 protocol or above.
.SH "ENVIRONMENT VARIABLES"
.PP
-The variable \fI$USER\fR may contain the
+The variable \fBUSER\fR may contain the
username of the person using the client. This information is
used only if the protocol level is high enough to support
session-level passwords.
.PP
-The variable \fI$PASSWD\fR may contain
+The variable \fBPASSWD\fR may contain
the password of the person using the client. This information is
used only if the protocol level is high enough to support
session-level passwords.
@@ -739,7 +739,7 @@ and writeable only by the user.
.PP
To test the client, you will need to know the name of a
running SMB/CIFS server. It is possible to run \fBsmbd(8)
-\fRan ordinary user - running that server as a daemon
+\fRas an ordinary user - running that server as a daemon
on a user-accessible port (typically any port number over 1024)
would provide a suitable test server.
.SH "DIAGNOSTICS"
diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1
index 25858c232d3..92043165952 100644
--- a/docs/manpages/smbcontrol.1
+++ b/docs/manpages/smbcontrol.1
@@ -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 SMBCONTROL 1 "23 Jun 2001" "smbcontrol 2.2.0a"
+.TH "SMBCONTROL" "1" "07 May 2001" "" ""
.SH NAME
smbcontrol \- send messages to smbd or nmbd processes
.SH SYNOPSIS
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index c8a9cc1c0e3..e4faaf60eb1 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 "23 Jun 2001" "smbd 2.2.0a"
+.TH "SMBD" "8" "05 July 2001" "" ""
.SH NAME
smbd \- server to provide SMB/CIFS services to clients
.SH SYNOPSIS
@@ -31,7 +31,8 @@ services, but will concentrate on the administrative aspects
of running the server.
.PP
Please note that there are significant security
-implications to running this server, and the \fIsmb.conf(5)\fRmanpage should be regarded as mandatory reading before
+implications to running this server, and the \fIsmb.conf(5)\fR
+manpage should be regarded as mandatory reading before
proceeding with installation.
.PP
A session is created whenever a client requests one.
@@ -45,7 +46,7 @@ are automatically reloaded every minute, if they change. You
can force a reload by sending a SIGHUP to the server. Reloading
the configuration file will not affect connections to any service
that is already established. Either the user will have to
-disconnect from the service, or smbd killed and restarted.
+disconnect from the service, or \fBsmbd\fR killed and restarted.
.SH "OPTIONS"
.TP
\fB-D\fR
@@ -53,9 +54,9 @@ If specified, this parameter causes
the server to operate as a daemon. That is, it detaches
itself and runs in the background, fielding requests
on the appropriate port. Operating the server as a
-daemon is the recommended way of running smbd for
+daemon is the recommended way of running \fBsmbd\fR for
servers that provide more than casual use file and
-print services. This switch is assumed is \fBsmbd
+print services. This switch is assumed if \fBsmbd
\fRis executed on the command line of a shell.
.TP
\fB-a\fR
@@ -70,7 +71,7 @@ log files will be overwritten when opened. By default,
files.
.TP
\fB-P\fR
-Passive option. Causes smbd not to
+Passive option. Causes \fBsmbd\fR not to
send any network traffic out. Used for debugging by
the developers only.
.TP
@@ -83,7 +84,7 @@ Prints the version number for
\fBsmbd\fR.
.TP
\fB-d <debug level>\fR
-debuglevel is an integer
+\fIdebuglevel\fR is an integer
from 0 to 10. The default value if this parameter is
not specified is zero.
@@ -105,19 +106,21 @@ override the log
levelfile.
.TP
\fB-l <log file>\fR
-If specified, \fBlog file\fR
+If specified, \fIlog file\fR
specifies a log filename into which informational and debug
messages from the running server will be logged. The log
file generated is never removed by the server although
-its size may be controlled by the max log sizeoption in the \fI smb.conf(5)\fRfile. The default log
+its size may be controlled by the max log size
+option in the \fI smb.conf(5)\fRfile. The default log
file name is specified at compile time.
.TP
\fB-O <socket options>\fR
-See the socket optionsparameter in the \fIsmb.conf(5)
+See the socket options
+parameter in the \fIsmb.conf(5)
\fRfile for details.
.TP
\fB-p <port number>\fR
-port number is a positive integer
+\fIport number\fR is a positive integer
value. The default value if this parameter is not
specified is 139.
@@ -174,7 +177,8 @@ See the section INSTALLATION below.
.TP
\fB\fI/usr/local/samba/lib/smb.conf\fB\fR
This is the default location of the
-\fIsmb.conf\fRserver configuration file. Other common places that systems
+\fIsmb.conf\fR
+server configuration file. Other common places that systems
install this file are \fI/usr/samba/lib/smb.conf\fR
and \fI/etc/smb.conf\fR.
@@ -209,10 +213,10 @@ in a directory readable by all, writeable only by root. The server
program itself should be executable by all, as users may wish to
run the server themselves (in which case it will of course run
with their privileges). The server should NOT be setuid. On some
-systems it may be worthwhile to make smbd setgid to an empty group.
+systems it may be worthwhile to make \fBsmbd\fR setgid to an empty group.
This is because some systems may have a security hole where daemon
processes that become a user can be attached to with a debugger.
-Making the smbd file setgid to an empty group may prevent
+Making the \fBsmbd\fR file setgid to an empty group may prevent
this hole from being exploited. This security hole and the suggested
fix has only been confirmed on old versions (pre-kernel 2.0) of Linux
at the time this was written. It is possible that this hole only
@@ -303,7 +307,7 @@ be omitted. See the section OPTIONS above.
.SH "RUNNING THE SERVER ON REQUEST"
.PP
If your system uses a meta-daemon such as \fBinetd
-\fR, you can arrange to have the smbd server started
+\fR, you can arrange to have the \fBsmbd\fR server started
whenever a process attempts to connect to it. This requires several
changes to the startup files on the host machine. If you are
experimenting as an ordinary user rather than as root, you will
@@ -369,6 +373,27 @@ all you need:
This will allow you to connect to your home directory
and print to any printer supported by the host (user privileges
permitting).
+.SH "PAM INTERACTION"
+.PP
+Samba uses PAM for authentication (when presented with a plaintext
+password), for account checking (is this account disabled?) and for
+session management. The degree too which samba supports PAM is restricted
+by the limitations of the SMB protocol and the
+obey pam restricions
+smb.conf paramater. When this is set, the following restrictions apply:
+.TP 0.2i
+\(bu
+\fBAccount Validation\fR: All acccesses to a
+samba server are checked
+against PAM to see if the account is vaild, not disabled and is permitted to
+login at this time. This also applies to encrypted logins.
+.TP 0.2i
+\(bu
+\fBSession Management\fR: When not using share
+level secuirty, users must pass PAM's session checks before access
+is granted. Note however, that this is bypassed in share level secuirty.
+Note also that some older pam configuration files may need a line
+added for session support.
.SH "TESTING THE INSTALLATION"
.PP
If running the server as a daemon, execute it before
@@ -377,8 +402,8 @@ or kill and restart the meta-daemon. Some versions of
\fBinetd\fR will reread their configuration
tables if they receive a HUP signal.
.PP
-If your machine's name is fred and your
-name is mary, you should now be able to connect
+If your machine's name is \fIfred\fR and your
+name is \fImary\fR, you should now be able to connect
to the service \fI\\\\fred\\mary\fR.
.PP
To properly test and experiment with the server, we
@@ -409,26 +434,26 @@ source code and inspect the conditions that gave rise to the
diagnostics you are seeing.
.SH "SIGNALS"
.PP
-Sending the smbd a SIGHUP will cause it to
-re-load its \fIsmb.conf\fR configuration
+Sending the \fBsmbd\fR a SIGHUP will cause it to
+reload its \fIsmb.conf\fR configuration
file within a short period of time.
.PP
-To shut down a users smbd process it is recommended
+To shut down a user's \fBsmbd\fR process it is recommended
that \fBSIGKILL (-9)\fR \fBNOT\fR
be used, except as a last resort, as this may leave the shared
memory area in an inconsistent state. The safe way to terminate
-an smbd is to send it a SIGTERM (-15) signal and wait for
+an \fBsmbd\fR is to send it a SIGTERM (-15) signal and wait for
it to die on its own.
.PP
-The debug log level of smbd may be raised by sending
+The debug log level of \fBsmbd\fR may be raised by sending
it a SIGUSR1 (\fBkill -USR1 <smbd-pid>\fR)
and lowered by sending it a SIGUSR2 (\fBkill -USR2 <smbd-pid>
\fR). This is to allow transient problems to be diagnosed,
whilst still running at a normally low log level.
.PP
Note that as the signal handlers send a debug write,
-they are not re-entrant in smbd. This you should wait until
-smbd is in a state of waiting for an incoming smb before
+they are not re-entrant in \fBsmbd\fR. This you should wait until
+\fBsmbd\fR is in a state of waiting for an incoming SMB before
issuing them. It is possible to make the signal handlers safe
by un-blocking the signals before the select call and re-blocking
them after, however this would affect performance.
diff --git a/docs/manpages/smbmnt.8 b/docs/manpages/smbmnt.8
index 1104791b128..74037b7c45a 100644
--- a/docs/manpages/smbmnt.8
+++ b/docs/manpages/smbmnt.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 SMBMNT 8 "23 Jun 2001" "smbmnt 2.2.0a"
+.TH "SMBMNT" "8" "22 June 2001" "" ""
.SH NAME
smbmnt \- helper utility for mounting SMB filesystems
.SH SYNOPSIS
@@ -14,7 +14,7 @@ smbmnt \- helper utility for mounting SMB filesystems
\fBsmbmnt\fR is a helper application used
by the smbmount program to do the actual mounting of SMB shares.
\fBsmbmnt\fR is meant to be installed setuid root
-so that normal users can mount their smb shares. It checks
+so that normal users can mount their SMB shares. It checks
whether the user has write permissions on the mount point and
then mounts the directory.
.PP
@@ -43,7 +43,7 @@ applied
.TP
\fB-o options\fR
list of options that are passed as-is to smbfs, if this
-command is run on a 2.4 or higher linux kernel.
+command is run on a 2.4 or higher Linux kernel.
.SH "AUTHOR"
.PP
Volker Lendecke, Andrew Tridgell, Michael H. Warfield
diff --git a/docs/manpages/smbmount.8 b/docs/manpages/smbmount.8
index 4d5ff3c5b00..b9c9bf7f239 100644
--- a/docs/manpages/smbmount.8
+++ b/docs/manpages/smbmount.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 SMBMOUNT 8 "23 Jun 2001" "smbmount 2.2.0a"
+.TH "SMBMOUNT" "8" "22 June 2001" "" ""
.SH NAME
smbmount \- mount an smbfs filesystem
.SH SYNOPSIS
@@ -16,17 +16,17 @@ is usually invoked as \fBmount.smb\fR from
the \fBmount(8)\fR command when using the
"-t smb" option. The kernel must support the smbfs filesystem.
.PP
-Options to smbmount are specified as a comma separated
+Options to \fBsmbmount\fR are specified as a comma-separated
list of key=value pairs. It is possible to send options other
than those listed here, assuming that smbfs supports them. If
you get mount failures, check your kernel log for errors on
unknown options.
.PP
-smbmount is a daemon. After mounting it keeps running until
+\fBsmbmount\fR is a daemon. After mounting it keeps running until
the mounted smbfs is umounted. It will log things that happen
when in daemon mode using the "machine name" smbmount, so
-typically this output will end up in log.smbmount. The
-smbmount process may also be called mount.smbfs.
+typically this output will end up in \fIlog.smbmount\fR. The
+\fBsmbmount\fR process may also be called mount.smbfs.
.PP
\fBNOTE:\fR \fBsmbmount\fR
calls \fBsmbmnt(8)\fR to do the actual mount. You
@@ -48,6 +48,12 @@ option is not given then the environment variable
no password \fBsmbmount\fR will prompt
for a passeword, unless the guest option is
given.
+
+Note that password which contain the arguement delimiter
+character (i.e. a comma ',') will failed to be parsed correctly
+on the command line. However, the same password defined
+in the PASSWD environment variable or a credentials file (see
+below) will be read correctly.
.TP
\fBcredentials=<filename>\fR
specifies a file that contains a username
@@ -62,7 +68,7 @@ and/or password. The format of the file is:
.fi
This is preferred over having passwords in plaintext in a
-shared file, such as /etc/fstab. Be sure to protect any
+shared file, such as \fI/etc/fstab\fR. Be sure to protect any
credentials file properly.
.TP
\fBnetbiosname=<arg>\fR
@@ -90,7 +96,7 @@ permissions that remote files have in the local filesystem.
The default is based on the current umask.
.TP
\fBdmask=<arg>\fR
-sets the directory mask. This deterines the
+sets the directory mask. This determines the
permissions that remote directories have in the local filesystem.
The default is based on the current umask.
.TP
@@ -121,7 +127,7 @@ mount read-only
mount read-write
.TP
\fBiocharset=<arg>\fR
-sets the charset used by the linux side for codepage
+sets the charset used by the Linux side for codepage
to charset translations (NLS). Argument should be the
name of a charset, like iso8859-1. (Note: only kernel
2.4.0 or later)
@@ -156,7 +162,7 @@ passwords.
.PP
The variable \fBPASSWD_FILE\fR may contain the pathname of
a file to read the password from. A single line of input is
-read and used as password.
+read and used as the password.
.SH "BUGS"
.PP
Not many known smbmount bugs. But one smbfs bug is
@@ -169,7 +175,7 @@ reconnect when the server disconnects, the mount will go
dead. A re-mount normally fixes this. At least 2 ways to
trigger this bug are known.
.PP
-Note that the typical response to a bugreport is suggestion
+Note that the typical response to a bug report is suggestion
to try the latest version first. So please try doing that first,
and always include which versions you use of relevant software
when reporting bugs (minimum: samba, kernel, distribution)
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index 551426dd819..234b4c746dc 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.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 SMBPASSWD 5 "23 Jun 2001" "smbpasswd 2.2.0a"
+.TH "SMBPASSWD" "5" "22 June 2001" "" ""
.SH NAME
smbpasswd \- The Samba encrypted password file
.SH SYNOPSIS
@@ -38,9 +38,9 @@ If this does not match then Samba will refuse to recognize
this smbpasswd file entry as being valid for a user.
.TP
\fBLanman Password Hash\fR
-This is the LANMAN hash of the users password,
+This is the LANMAN hash of the user's password,
encoded as 32 hex digits. The LANMAN hash is created by DES
-encrypting a well known string with the users password as the
+encrypting a well known string with the user's password as the
DES key. This is the same password used by Windows 95/98 machines.
Note that this password hash is regarded as weak as it is
vulnerable to dictionary attacks and if two users choose the
@@ -48,7 +48,7 @@ same password this entry will be identical (i.e. the password
is not "salted" as the UNIX password is). If the user has a
null password this field will contain the characters "NO PASSWORD"
as the start of the hex string. If the hex string is equal to
-32 'X' characters then the users account is marked as
+32 'X' characters then the user's account is marked as
disabled and the user will not be able to
log onto the Samba server.
@@ -65,14 +65,14 @@ itself must be set to be read/write only by root, with no
other access.
.TP
\fBNT Password Hash\fR
-This is the Windows NT hash of the users
+This is the Windows NT hash of the user's
password, encoded as 32 hex digits. The Windows NT hash is
-created by taking the users password as represented in
+created by taking the user's password as represented in
16-bit, little-endian UNICODE and then applying the MD4
(internet rfc1321) hashing algorithm to it.
This password hash is considered more secure than
-the Lanman Password Hash as it preserves the case of the
+the LANMAN Password Hash as it preserves the case of the
password and uses a much higher quality hashing algorithm.
However, it is still the case that if two users choose the same
password this entry will be identical (i.e. the password is
@@ -106,7 +106,7 @@ in the smbpasswd file.
.TP 0.2i
\(bu
\fBN\fR - This means the
-account has no password (the passwords in the fields Lanman
+account has no password (the passwords in the fields LANMAN
Password Hash and NT Password Hash are ignored). Note that this
will only allow users to log on with no password if the \fI null passwords\fR parameter is set in the \fIsmb.conf(5)
\fRconfig file.
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index a658e7cc3b3..91c344f11d0 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -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 SMBPASSWD 8 "23 Jun 2001" "smbpasswd 2.2.0a"
+.TH "SMBPASSWD" "8" "22 June 2001" "" ""
.SH NAME
-smbpasswd \- change a users SMB password
+smbpasswd \- change a user's SMB password
.SH SYNOPSIS
.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\fR ] [ \fB-h\fR ] [ \fB-s\fR ] [ \fBusername\fR ]
@@ -20,7 +20,7 @@ the password used for their SMB sessions on any machines that store
SMB passwords.
.PP
By default (when run with no arguments) it will attempt to
-change the current users SMB password on the local machine. This is
+change the current user's SMB password on the local machine. This is
similar to the way the \fBpasswd(1)\fR program works.
\fBsmbpasswd\fR differs from how the passwd program works
however in that it is not \fBsetuid root\fR but works in
@@ -31,10 +31,10 @@ UNIX machine the encrypted SMB passwords are usually stored in
the \fIsmbpasswd(5)\fR file.
.PP
When run by an ordinary user with no options. smbpasswd
-will prompt them for their old smb password and then ask them
+will prompt them for their old SMB password and then ask them
for their new password twice, to ensure that the new password
was typed correctly. No passwords will be echoed on the screen
-whilst being typed. If you have a blank smb password (specified by
+whilst being typed. If you have a blank SMB password (specified by
the string "NO PASSWORD" in the smbpasswd file) then just press
the <Enter> key when asked for your old password.
.PP
@@ -79,7 +79,7 @@ is done all attempts to authenticate via SMB using this username
will fail.
If the smbpasswd file is in the 'old' format (pre-Samba 2.0
-format) there is no space in the users password entry to write
+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.
@@ -254,7 +254,7 @@ or as an ordinary user.
.TP
\fB-s\fR
This option causes smbpasswd to be silent (i.e.
-not issue prompts) and to read it's old and new passwords from
+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
@@ -285,7 +285,8 @@ the Samba suite.
.SH "SEE ALSO"
.PP
\fIsmbpasswd(5)\fR,
-samba(7).SH "AUTHOR"
+samba(7)
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/smbrun.1 b/docs/manpages/smbrun.1
index 2934cd60658..c671a505aee 100644
--- a/docs/manpages/smbrun.1
+++ b/docs/manpages/smbrun.1
@@ -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 SMBRUN 1 "23 Jun 2001" "smbrun 2.2.0a"
+.TH SMBRUN 1 "24 Mar 2001" "smbrun 2.2.0-alpha3"
.SH NAME
smbrun \- interface program between smbd and external programs
.SH SYNOPSIS
diff --git a/docs/manpages/smbsh.1 b/docs/manpages/smbsh.1
index efa1c4523b2..ac5d5f073c5 100644
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.1
@@ -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 SMBSH 1 "23 Jun 2001" "smbsh 2.2.0a"
+.TH "SMBSH" "1" "22 June 2001" "" ""
.SH NAME
smbsh \- Allows access to Windows NT filesystem using UNIX commands
.SH SYNOPSIS
@@ -15,7 +15,7 @@ This tool is part of the Sambasuite.
.PP
\fBsmbsh\fR allows you to access an NT filesystem
using UNIX commands such as \fBls\fR, \fB egrep\fR, and \fBrcp\fR. You must use a
-shell that is dynmanically linked in order for \fBsmbsh\fR
+shell that is dynamically linked in order for \fBsmbsh\fR
to work correctly.
.PP
To use the \fBsmbsh\fR command, execute \fB smbsh\fR from the prompt and enter the username and password
@@ -56,7 +56,8 @@ describe how a program was linked.
.SH "SEE ALSO"
.PP
\fBsmbd(8)\fR,
-smb.conf(5).SH "AUTHOR"
+smb.conf(5)
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8
index d2851da4858..9597f840b73 100644
--- a/docs/manpages/smbspool.8
+++ b/docs/manpages/smbspool.8
@@ -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 SMBSPOOL 8 "23 Jun 2001" "smbspool 2.2.0a"
+.TH "SMBSPOOL" "8" "22 June 2001" "" ""
.SH NAME
-nmblookup \- send print file to an SMB printer
+smbspool \- send print file to an SMB printer
.SH SYNOPSIS
.sp
\fBsmbspool\fR [ \fBjob\fR ] [ \fBuser\fR ] [ \fBtitle\fR ] [ \fBcopies\fR ] [ \fBoptions\fR ] [ \fBfilename\fR ]
@@ -38,12 +38,12 @@ smb://username:password@server/printer
smb://username:password@workgroup/server/printer
.PP
smbspool tries to get the URI from argv[0]. If argv[0]
-contains the name of the program then it looks in the \fI DEVICE_URI\fR environment variable.
+contains the name of the program then it looks in the \fB DEVICE_URI\fR environment variable.
.PP
.PP
Programs using the \fBexec(2)\fR functions can
pass the URI in argv[0], while shell scripts must set the
-\fIDEVICE_URI\fR environment variable prior to
+\fBDEVICE_URI\fR environment variable prior to
running smbspool.
.PP
.SH "OPTIONS"
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 88de3d4c8ca..21275c25a26 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -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 SMBSTATUS 1 "23 Jun 2001" "smbstatus 2.2.0a"
+.TH "SMBSTATUS" "1" "07 May 2001" "" ""
.SH NAME
smbstatus \- report on current Samba connections
.SH SYNOPSIS
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index 2bbe5254f59..001062468b0 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -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 SMBTAR 1 "23 Jun 2001" "smbtar 2.2.0a"
+.TH "SMBTAR" "1" "03 May 2001" "" ""
.SH NAME
smbtar \- shell script for backing up SMB/CIFS shares directly to UNIX tape drives
.SH SYNOPSIS
@@ -14,7 +14,8 @@ smbtar \- shell script for backing up SMB/CIFS shares directly to UNIX tape dri
This tool is part of the Sambasuite.
.PP
\fBsmbtar\fR is a very small shell script on top
-of \fBsmbclient(1)\fRwhich dumps SMB shares directly to tape.
+of \fBsmbclient(1)\fR
+which dumps SMB shares directly to tape.
.SH "OPTIONS"
.TP
\fB-s server\fR
diff --git a/docs/manpages/smbumount.8 b/docs/manpages/smbumount.8
index 8d0a3aba588..5bc1d61c00d 100644
--- a/docs/manpages/smbumount.8
+++ b/docs/manpages/smbumount.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 SMBUMOUNT 8 "23 Jun 2001" "smbumount 2.2.0a"
+.TH "SMBUMOUNT" "8" "22 June 2001" "" ""
.SH NAME
smbumount \- smbfs umount for normal users
.SH SYNOPSIS
@@ -13,7 +13,7 @@ smbumount \- smbfs umount for normal users
.PP
With this program, normal users can unmount smb-filesystems,
provided that it is suid root. \fBsmbumount\fR has
-been written to give normal linux-users more control over their
+been written to give normal Linux users more control over their
resources. It is safe to install this program suid root, because only
the user who has mounted a filesystem is allowed to unmount it again.
For root it is not necessary to use smbumount. The normal umount
@@ -26,6 +26,7 @@ The directory to unmount.
.SH "SEE ALSO"
.PP
\fBsmbmount(8)\fR
+
.SH "AUTHOR"
.PP
Volker Lendecke, Andrew Tridgell, Michael H. Warfield
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index ed4f7cf541a..2d1d13ccefe 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.8
@@ -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 SWAT 8 "23 Jun 2001" "swat 2.2.0a"
+.TH "SWAT" "8" "22 June 2001" "" ""
.SH NAME
swat \- Samba Web Administration Tool
.SH SYNOPSIS
.sp
-\fBnmblookup\fR [ \fB-s <smb config file>\fR ] [ \fB-a\fR ]
+\fBswat\fR [ \fB-s <smb config file>\fR ] [ \fB-a\fR ]
.SH "DESCRIPTION"
.PP
This tool is part of the Sambasuite.
@@ -16,17 +16,17 @@ This tool is part of the Sambasuite.
\fBswat\fR allows a Samba administrator to
configure the complex \fI smb.conf(5)\fRfile via a Web browser. In addition,
a \fBswat\fR configuration page has help links
-to all the configurable options in the smb.conf file allowing an
+to all the configurable options in the \fIsmb.conf\fR file allowing an
administrator to easily look up the effects of any change.
.PP
-swat is run from inetd
+\fBswat\fR is run from \fBinetd\fR
.SH "OPTIONS"
.TP
\fB-s smb configuration file\fR
The default configuration file path is
determined at compile time. The file specified contains
the configuration details required by the \fBsmbd
-\fRserver. This is the file that swat will modify.
+\fRserver. This is the file that \fBswat\fR will modify.
The information in this file includes server-specific
information such as what printcap file to use, as well as
descriptions of all the services that the server is to provide.
@@ -34,8 +34,8 @@ See \fIsmb.conf\fR for more information.
.TP
\fB-a\fR
This option disables authentication and puts
-swat in demo mode. In that mode anyone will be able to modify
-the smb.conf file.
+\fBswat\fR in demo mode. In that mode anyone will be able to modify
+the \fIsmb.conf\fR file.
\fBDo NOT enable this option on a production
server. \fR
@@ -58,7 +58,7 @@ these in:
.PP
You need to edit your \fI/etc/inetd.conf
\fRand \fI/etc/services\fR
-to enable SWAT to be launched via inetd.
+to enable SWAT to be launched via \fBinetd\fR.
.PP
In \fI/etc/services\fR you need to
add a line like this:
@@ -86,10 +86,10 @@ HUP signal to inetd. To do this use \fBkill -1 PID
\fRwhere PID is the process ID of the inetd daemon.
.SS "LAUNCHING"
.PP
-To launch swat just run your favorite web browser and
+To launch SWAT just run your favorite web browser and
point it at "http://localhost:901/".
.PP
-Note that you can attach to swat from any IP connected
+Note that you can attach to SWAT from any IP connected
machine but connecting from a remote machine leaves your
connection open to password sniffing as passwords will be sent
in the clear over the wire.
@@ -124,7 +124,8 @@ the Samba suite.
.PP
\fBinetd(5)\fR,
\fBsmbd(8)\fR,
-smb.conf(5).SH "AUTHOR"
+smb.conf(5)
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index fbafd57df6b..b87c2a29bb2 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -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 TESTPARM 1 "23 Jun 2001" "testparm 2.2.0a"
+.TH "TESTPARM" "1" "22 June 2001" "" ""
.SH NAME
testparm \- check an smb.conf configuration file for internal correctness
.SH SYNOPSIS
@@ -42,7 +42,7 @@ names and before dumping the service definitions.
Print usage message
.TP
\fB-L servername\fR
-Sets the value of the %L macro to servername.
+Sets the value of the %L macro to \fIservername\fR.
This is useful for testing include files specified with the
%L macro.
.TP
@@ -53,7 +53,7 @@ default \fIsmb.conf\fR file will be checked.
.TP
\fBhostname\fR
If this parameter and the following are
-specified, then testparm will examine the \fIhosts
+specified, then \fBtestparm\fR will examine the \fIhosts
allow\fR and \fIhosts deny\fR
parameters in the \fIsmb.conf\fR file to
determine if the hostname with this IP address would be
@@ -73,7 +73,7 @@ file used by \fBsmbd\fR.
.SH "DIAGNOSTICS"
.PP
The program will issue a message saying whether the
-configuration file loaded OK or not. This message may be preceeded by
+configuration file loaded OK or not. This message may be preceded by
errors and warnings if the file did not load. If the file was
loaded OK, the program then dumps all known service details
to stdout.
@@ -84,7 +84,8 @@ the Samba suite.
.SH "SEE ALSO"
.PP
\fIsmb.conf(5)\fR,
-\fBsmbd(8)\fR.SH "AUTHOR"
+\fBsmbd(8)\fR
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1
index 35e93721845..7dee600459a 100644
--- a/docs/manpages/testprns.1
+++ b/docs/manpages/testprns.1
@@ -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 TESTPRNS 1 "23 Jun 2001" "testprns 2.2.0a"
+.TH "TESTPRNS" "1" "03 May 2001" "" ""
.SH NAME
testprns \- check printer name for validity with smbd
.SH SYNOPSIS
@@ -74,7 +74,8 @@ the Samba suite.
.PP
\fIprintcap(5)\fR,
\fBsmbd(8)\fR,
-\fBsmbclient(1)\fR.SH "AUTHOR"
+\fBsmbclient(1)\fR
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 5626d97ebd5..653c8304cd1 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -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 WBINFO 1 "23 Jun 2001" "wbinfo 2.2.0a"
+.TH "WBINFO" "1" "22 June 2001" "" ""
.SH NAME
wbinfo \- Query information from winbind daemon
.SH SYNOPSIS
@@ -86,7 +86,7 @@ NT domain the server is a Primary Domain Controller for.
.PP
The wbinfo program returns 0 if the operation
succeeded, or 1 if the operation failed. If the \fBwinbindd(8)
-\fRdaemon is not working wbinfo will always return
+\fRdaemon is not working \fBwbinfo\fR will always return
failure.
.SH "VERSION"
.PP
@@ -96,6 +96,7 @@ stable release of Samba as of yet.
.SH "SEE ALSO"
.PP
\fBwinbindd(8)\fR
+
.SH "AUTHOR"
.PP
The original Samba software and related utilities
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index 30df97efe51..5f891021b43 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.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 WINBINDD 8 "23 Jun 2001" "winbindd 2.2.0a"
+.TH "WINBINDD" "8" "22 June 2001" "" ""
.SH NAME
winbindd \- Name Service Switch daemon for resolving names from NT servers
.SH SYNOPSIS
@@ -24,7 +24,7 @@ Users and groups are allocated as they are resolved to a range
of user and group ids specified by the administrator of the
Samba system.
.PP
-The service provided by winbindd is called `winbind' and
+The service provided by \fBwinbindd\fR is called `winbind' and
can be used to resolve user and group information from a
Windows NT server. The service can also provide authentication
services via an associated PAM module.
@@ -107,7 +107,7 @@ separator so that the unix user names look like
DOMAIN\\username. In some cases this separator character may
cause problems as the '\\' character has special meaning in
unix shells. In that case you can use the winbind separator
-option to specify an alternative sepataror character. Good
+option to specify an alternative separator character. Good
alternatives may be '/' (although that conflicts
with the unix directory separator) or a '+ 'character.
The '+' character appears to be the best choice for 100%
@@ -121,7 +121,7 @@ Example: \fBwinbind separator = + \fR
\fBwinbind uid\fR
The winbind uid parameter specifies the
range of user ids that are allocated by the winbindd daemon.
-This range of ids should have no existing local or nis users
+This range of ids should have no existing local or NIS users
within it as strange conflicts can occur otherwise.
Default: \fBwinbind uid = <empty string>
@@ -131,7 +131,7 @@ Example: \fBwinbind uid = 10000-20000\fR
\fBwinbind gid\fR
The winbind gid parameter specifies the
range of group ids that are allocated by the winbindd daemon.
-This range of group ids should have no existing local or nis
+This range of group ids should have no existing local or NIS
groups within it as strange conflicts can occur otherwise.
Default: \fBwinbind gid = <empty string>
@@ -143,7 +143,7 @@ This parameter specifies the number of
seconds the winbindd daemon will cache user and group information
before querying a Windows NT server again. When a item in the
cache is older than this time winbindd will ask the domain
-controller for the sequence number of the servers account database.
+controller for the sequence number of the server's account database.
If the sequence number has not changed then the cached item is
marked as valid for a further \fIwinbind cache time
\fRseconds. Otherwise the item is fetched from the
@@ -163,7 +163,7 @@ calls to the \fBgetpwent\fR system call will not
return any data.
\fBWarning:\fR Turning off user enumeration
-may cause some programs to behave oddly. For example, the finger
+may cause some programs to behave oddly. For example, the \fBfinger\fR
program relies on having access to the full user list when
searching for matching usernames.
@@ -242,7 +242,7 @@ The next step is to join the domain. To do that use the
\fBsamedit -S '*' -W DOMAIN -UAdministrator\fR
.PP
The username after the \fI-U\fR can be any Domain
-user that has administrator priviliges on the machine. Next from
+user that has administrator privileges on the machine. Next from
within \fBsamedit\fR, run the command:
.PP
\fBcreateuser MACHINE$ -j DOMAIN -L\fR
@@ -250,11 +250,15 @@ within \fBsamedit\fR, run the command:
This assumes your domain is called "DOMAIN" and your Samba
workstation is called "MACHINE".
.PP
-Next copy \fIlibnss_winbind.so.2\fR to
+Next copy \fIlibnss_winbind.so\fR to
\fI/lib\fR and \fIpam_winbind.so\fR
-to \fI/lib/security\fR.
+to \fI/lib/security\fR. A symbolic link needs to be
+made from \fI/lib/libnss_winbind.so\fR to
+\fI/lib/libnss_winbind.so.2\fR. If you are using an
+older version of glibc then the target of the link should be
+\fI/lib/libnss_winbind.so.1\fR.
.PP
-Finally, setup a smb.conf containing directives like the
+Finally, setup a \fIsmb.conf\fR containing directives like the
following:
.PP
.sp
@@ -354,13 +358,14 @@ Storage for cached user and group information.
.PP
This man page is correct for version 2.2 of
the Samba suite. winbindd is however not available in
-stable release of Samba as of yet.
+the stable release of Samba as of yet.
.SH "SEE ALSO"
.PP
\fInsswitch.conf(5)\fR,
samba(7),
wbinfo(1),
-smb.conf(5).SH "AUTHOR"
+smb.conf(5)
+.SH "AUTHOR"
.PP
The original Samba software and related utilities
were created by Andrew Tridgell. Samba is now developed