updated passdb backend parameter

(This used to be commit 36a1fea696ca2c729c0f2e71d4587fafdc3daf94)

2 files changed, 32 insertions, 10 deletions

diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8
index 4259bbbc4f..82765d6dad 100644
--- a/docs/manpages/pdbedit.8
+++ b/docs/manpages/pdbedit.8
@@ -3,12 +3,12 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "PDBEDIT" "8" "04 March 2003" "" ""
+.TH "PDBEDIT" "8" "30 March 2003" "" ""
 .SH NAME
 pdbedit \- manage the SAM database
 .SH SYNOPSIS
 
-\fBpdbedit\fR [ \fB-l\fR ] [ \fB-v\fR ] [ \fB-w\fR ] [ \fB-u username\fR ] [ \fB-f fullname\fR ] [ \fB-h homedir\fR ] [ \fB-D drive\fR ] [ \fB-S script\fR ] [ \fB-p profile\fR ] [ \fB-a\fR ] [ \fB-m\fR ] [ \fB-x\fR ] [ \fB-i passdb-backend\fR ] [ \fB-e passdb-backend\fR ] [ \fB-b passdb-backend\fR ] [ \fB-d debuglevel\fR ] [ \fB-s configfile\fR ] [ \fB-P account-policy\fR ] [ \fB-V value\fR ]
+\fBpdbedit\fR [ \fB-l\fR ] [ \fB-v\fR ] [ \fB-w\fR ] [ \fB-u username\fR ] [ \fB-f fullname\fR ] [ \fB-h homedir\fR ] [ \fB-D drive\fR ] [ \fB-S script\fR ] [ \fB-p profile\fR ] [ \fB-a\fR ] [ \fB-m\fR ] [ \fB-x\fR ] [ \fB-i passdb-backend\fR ] [ \fB-e passdb-backend\fR ] [ \fB-g\fR ] [ \fB-b passdb-backend\fR ] [ \fB-d debuglevel\fR ] [ \fB-s configfile\fR ] [ \fB-P account-policy\fR ] [ \fB-V value\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -177,6 +177,14 @@ another and will ease backing up.
 
 Example: \fBpdbedit -e smbpasswd:/root/samba-users.backup\fR
 .TP
+\fB-g\fR
+If you specify \fI-g\fR,
+then \fI-i in-backend -e out-backend\fR
+applies to the group mapping instead of the user database.
+
+This option will ease migration from one passdb backend to
+another and will ease backing up.
+.TP
 \fB-b passdb-backend\fR
 Use a different default passdb backend. 
 
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index c6dc6c3a11..02861d492d 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "04 March 2003" "" ""
+.TH "SMB.CONF" "5" "30 March 2003" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -670,6 +670,12 @@ each parameter for details.  Note that some are synonyms.
 \fIldap admin dn\fR
 .TP 0.2i
 \(bu
+\fIldap delete dn\fR
+.TP 0.2i
+\(bu
+\fIldap del only sam attr\fR
+.TP 0.2i
+\(bu
 \fIldap filter\fR
 .TP 0.2i
 \(bu
@@ -3382,9 +3388,17 @@ user account information. The \fIldap
 admin dn\fR is used in conjunction with the admin dn password
 stored in the \fIprivate/secrets.tdb\fR file.  See the
 \fBsmbpasswd(8)\fR man
-page for more information on how to accmplish this.
+page for more information on how to accomplish this.
+.TP
+\fB>ldap del only sam attr (G)\fR
+This parameter specifies whether a delete
+operation in the ldapsam deletes the complete entry or only the attributes
+specific to Samba.
 
-Default : \fBnone\fR
+Default : \fBldap delete dn = no\fR
+.TP
+\fB>ldap del only sam attr (G)\fR
+Inverted synonym for \fI  ldap delete dn\fR.
 .TP
 \fBldap filter (G)\fR
 This parameter specifies the RFC 2254 compliant LDAP search filter.
@@ -4978,7 +4992,7 @@ Any characters after the (optional) second : are passed to the plugin
 for its own processing
 .TP 0.2i
 \(bu
-\fBunixsam\fR - Allows samba to map all (other) available unix users
+\fBunixsam\fR - (EXPERIMENTAL) Allows samba to map all (other) available unix users
 
 This backend uses the standard unix database for retrieving users. Users included 
 in this pdb are NOT listed in samba user listings and users included in this pdb won't be 
@@ -4991,11 +5005,11 @@ the unix passdb and might 'override' mappings if specified earlier. It's meant t
 accounts for users that aren't covered by the previous backends.
 .RE
 
-Default: \fBpassdb backend = smbpasswd unixsam\fR
+Default: \fBpassdb backend = smbpasswd guest\fR
 
-Example: \fBpassdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd unixsam\fR
+Example: \fBpassdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd \fR
 
-Example: \fBpassdb backend = ldapsam_nua:ldaps://ldap.example.com unixsam\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 tdbsam:/etc/samba/private/passdb.tdb\fR
 .TP
@@ -5157,7 +5171,7 @@ parameter \fIname
 resolve order\fR and so may resolved
 by any method and order described in that parameter.
 
-The password server much be a machine capable of using 
+The password server must be a machine capable of using 
 the "LM1.2X002" or the "NT LM 0.12" protocol, and it must be in 
 user level security mode.