* merges from SAMBA_2_2

* addedd "private dir" to smb.conf.5.sgml
* regenerated man pages, HOWTOs, etc...
(This used to be commit 3b29006e35a991d20cda1c92d535ef016099d0d4)

1 files changed, 72 insertions, 4 deletions

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 7b24cfddc6..32a40d2609 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" "19 February 2002" "" ""
+.TH "SMB.CONF" "5" "01 April 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -360,6 +360,9 @@ the NetBIOS name of the client machine
 the NetBIOS name of the server. This allows you 
 to change your config based on what the client calls you. Your 
 server can have a "dual personality".
+
+Note that this paramater is not available when Samba listens
+on port 445, as clients no longer send this information 
 .TP
 \fB%M\fR
 the Internet name of the client machine.
@@ -830,6 +833,9 @@ each parameter for details. Note that some are synonyms.
 \fIprinter driver file\fR
 .TP 0.2i
 \(bu
+\fIprivate dir\fR
+.TP 0.2i
+\(bu
 \fIprotocol\fR
 .TP 0.2i
 \(bu
@@ -3218,10 +3224,10 @@ supports the new 64k streaming read and write varient SMB requests introduced
 with Windows 2000. Note that due to Windows 2000 client redirector bugs
 this requires Samba to be running on a 64-bit capable operating system such
 as IRIX, Solaris or a Linux 2.4 kernel. Can improve performance by 10% with
-Windows 2000 clients. Defaults to off. Not as tested as some other Samba
+Windows 2000 clients. Defaults to on. Not as tested as some other Samba
 code paths.
 
-Default : \fBlarge readwrite = no\fR
+Default : \fBlarge readwrite = yes\fR
 .TP
 \fBldap admin dn (G)\fR
 This parameter is only available if Samba has been
@@ -4629,9 +4635,64 @@ smbpasswd and tdbsam to be used without a recompile. Only one can
 be used at a time however, and experimental backends must still be selected
 (eg --with-tdbsam) at configure time.
 
+This paramater is in two parts, the backend's name, and a 'location'
+string that has meaning only to that particular backed. These are separated
+by a : character.
+
+Available backends can include:
+.RS
+.TP 0.2i
+\(bu
+\fBsmbpasswd\fR - The default smbpasswd
+backend. Takes a path to the smbpasswd file as an optional argument.
+.TP 0.2i
+\(bu
+\fBsmbpasswd_nua\fR - The smbpasswd
+backend, but with support for 'not unix accounts'. 
+Takes a path to the smbpasswd file as an optional argument.
+
+See also  \fInon unix account range\fR
+.TP 0.2i
+\(bu
+\fBtdbsam\fR - The TDB based password storage
+backend. Takes a path to the TDB as an optional argument (defaults to passdb.tdb 
+in the  \fIprivate dir\fR directory.
+.TP 0.2i
+\(bu
+\fBtdbsam_nua\fR - The TDB based password storage
+backend, with non unix account support. Takes a path to the TDB as an optional argument (defaults to passdb.tdb 
+in the  \fIprivate dir\fR directory.
+
+See also  \fInon unix account range\fR
+.TP 0.2i
+\(bu
+\fBldapsam\fR - The LDAP based passdb 
+backend. Takes an LDAP URL as an optional argument (defaults to 
+\fBldap://localhost\fR)
+.TP 0.2i
+\(bu
+\fBldapsam_nua\fR - The LDAP based passdb 
+backend, with non unix account support. Takes an LDAP URL as an optional argument (defaults to 
+\fBldap://localhost\fR)
+
+See also  \fInon unix account range\fR
+.TP 0.2i
+\(bu
+\fBplugin\fR - Allows Samba to load an 
+arbitary passdb backend from the .so specified as a compulsary argument.
+
+Any characters after the (optional) second : are passed to the plugin
+for its own processing
+.RE
+.PP
+
 Default: \fBpassdb backend = smbpasswd\fR
 
-Example: \fBpassdb backend = tdbsam\fR
+Example: \fBpassdb backend = tdbsam:/etc/samba/private/passdb.tdb\fR
+
+Example: \fBpassdb backend = ldapsam_nua:ldaps://ldap.example.com\fR
+
+Example: \fBpassdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args\fR
 .TP
 \fBpasswd chat (G)\fR
 This string controls the \fB"chat"\fR 
@@ -5258,6 +5319,13 @@ This option can be set on a per printer basis
 
 See also the discussion in the  [printers] section.
 .TP
+\fBprivate dir (G)\fR
+This parameters defines the directory
+smbd will use for storing such files as \fIsmbpasswd\fR
+and \fIsecrets.tdb\fR.
+
+Default :\fBprivate dir = ${prefix}/private\fR
+.TP
 \fBprotocol (G)\fR
 Synonym for  \fImax protocol\fR.
 .TP