diff options
| -rw-r--r-- | docs/docbook/manpages/pdbedit.8.sgml | 1 | ||||
| -rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 18 | ||||
| -rw-r--r-- | docs/htmldocs/pdbedit.8.html | 36 | ||||
| -rw-r--r-- | docs/htmldocs/smb.conf.5.html | 82 | ||||
| -rw-r--r-- | docs/manpages/pdbedit.8 | 12 | ||||
| -rw-r--r-- | docs/manpages/smb.conf.5 | 30 |
6 files changed, 140 insertions, 39 deletions
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml index 2457d899de..3454b7d7fa 100644 --- a/docs/docbook/manpages/pdbedit.8.sgml +++ b/docs/docbook/manpages/pdbedit.8.sgml @@ -271,6 +271,7 @@ <listitem><para>If you specify <parameter>-g</parameter>, then <parameter>-i in-backend -e out-backend</parameter> applies to the group mapping instead of the user database. + </para> <para>This option will ease migration from one passdb backend to another and will ease backing up.</para> diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index c45b698a41..70b3cd57f5 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -3425,14 +3425,16 @@ <varlistentry> <term><anchor id="LDAPADMINDN">ldap admin dn (G)</term> - <listitem><para> The <parameter>ldap admin dn</parameter> defines the Distinguished + <listitem><para>The <parameter>ldap admin dn</parameter> defines the Distinguished Name (DN) name used by Samba to contact the ldap server when retreiving user account information. The <parameter>ldap admin dn</parameter> is used in conjunction with the admin dn password stored in the <filename>private/secrets.tdb</filename> file. See the <ulink url="smbpasswd.8.html"><command>smbpasswd(8)</command></ulink> man - page for more information on how to accmplish this. + page for more information on how to accomplish this. </para> + </listitem> + </varlistentry> <varlistentry> <term><anchor id="LDAPDELETEDN"/>ldap del only sam attr (G)</term> @@ -3448,8 +3450,8 @@ <varlistentry> <term><anchor id="LDAPDELONLYSAMATTR"/>ldap del only sam attr (G)</term> - <listitem><para> Inverted synonym for <link linked="LDAPDELETEDN"><parameter> - ldap delete dn</parameter></link>.</para> + <listitem><para> Inverted synonym for <link linkend="LDAPDELETEDN"><parameter> + ldap delete dn</parameter></link>. </para> </listitem> </varlistentry> @@ -5478,7 +5480,7 @@ for its own processing</para> </listitem> - <listitem><para><command>unixsam</command> - Allows samba to map all (other) available unix users</para> + <listitem><para><command>unixsam</command> - (EXPERIMENTAL) Allows samba to map all (other) available unix users</para> <para>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 @@ -5494,9 +5496,9 @@ </itemizedlist> </para> - <para>Default: <command>passdb backend = smbpasswd unixsam</command></para> - <para>Example: <command>passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd unixsam</command></para> - <para>Example: <command>passdb backend = ldapsam_nua:ldaps://ldap.example.com unixsam</command></para> + <para>Default: <command>passdb backend = smbpasswd guest</command></para> + <para>Example: <command>passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd </command></para> + <para>Example: <command>passdb backend = ldapsam_nua:ldaps://ldap.example.com </command></para> <para>Example: <command>passdb backend = plugin:/usr/local/samba/lib/my_passdb.so:my_plugin_args tdbsam:/etc/samba/private/passdb.tdb</command></para> </listitem> </varlistentry> diff --git a/docs/htmldocs/pdbedit.8.html b/docs/htmldocs/pdbedit.8.html index e3cf1e4fba..7b85e2bb80 100644 --- a/docs/htmldocs/pdbedit.8.html +++ b/docs/htmldocs/pdbedit.8.html @@ -34,12 +34,12 @@ NAME="AEN8"><H2 ><B CLASS="COMMAND" >pdbedit</B -> [-l] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-D drive] [-S script] [-p profile] [-a] [-m] [-x] [-i passdb-backend] [-e passdb-backend] [-b passdb-backend] [-d debuglevel] [-s configfile] [-P account-policy] [-V value]</P +> [-l] [-v] [-w] [-u username] [-f fullname] [-h homedir] [-D drive] [-S script] [-p profile] [-a] [-m] [-x] [-i passdb-backend] [-e passdb-backend] [-g] [-b passdb-backend] [-d debuglevel] [-s configfile] [-P account-policy] [-V value]</P ></DIV ><DIV CLASS="REFSECT1" ><A -NAME="AEN30" +NAME="AEN31" ></A ><H2 >DESCRIPTION</H2 @@ -65,7 +65,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN37" +NAME="AEN38" ></A ><H2 >OPTIONS</H2 @@ -369,6 +369,28 @@ CLASS="COMMAND" ></P ></DD ><DT +>-g</DT +><DD +><P +>If you specify <TT +CLASS="PARAMETER" +><I +>-g</I +></TT +>, + then <TT +CLASS="PARAMETER" +><I +>-i in-backend -e out-backend</I +></TT +> + applies to the group mapping instead of the user database. + </P +><P +>This option will ease migration from one passdb backend to + another and will ease backing up.</P +></DD +><DT >-b passdb-backend</DT ><DD ><P @@ -517,7 +539,7 @@ compile time.</P ><DIV CLASS="REFSECT1" ><A -NAME="AEN182" +NAME="AEN190" ></A ><H2 >NOTES</H2 @@ -527,7 +549,7 @@ NAME="AEN182" ><DIV CLASS="REFSECT1" ><A -NAME="AEN185" +NAME="AEN193" ></A ><H2 >VERSION</H2 @@ -538,7 +560,7 @@ NAME="AEN185" ><DIV CLASS="REFSECT1" ><A -NAME="AEN188" +NAME="AEN196" ></A ><H2 >SEE ALSO</H2 @@ -558,7 +580,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN193" +NAME="AEN201" ></A ><H2 >AUTHOR</H2 diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html index 9c1ee7a67b..4f02951a9c 100644 --- a/docs/htmldocs/smb.conf.5.html +++ b/docs/htmldocs/smb.conf.5.html @@ -1591,6 +1591,30 @@ CLASS="PARAMETER" ><LI ><P ><A +HREF="#LDAPDELETEDN" +><TT +CLASS="PARAMETER" +><I +>ldap delete dn</I +></TT +></A +></P +></LI +><LI +><P +><A +HREF="#LDAPDELONLYSAMATTR" +><TT +CLASS="PARAMETER" +><I +>ldap del only sam attr</I +></TT +></A +></P +></LI +><LI +><P +><A HREF="#LDAPFILTER" ><TT CLASS="PARAMETER" @@ -3177,7 +3201,7 @@ CLASS="PARAMETER" ><DIV CLASS="REFSECT1" ><A -NAME="AEN1021" +NAME="AEN1029" ></A ><H2 >COMPLETE LIST OF SERVICE PARAMETERS</H2 @@ -4692,7 +4716,7 @@ CLASS="PARAMETER" ><DIV CLASS="REFSECT1" ><A -NAME="AEN1525" +NAME="AEN1533" ></A ><H2 >EXPLANATION OF EACH PARAMETER</H2 @@ -9770,7 +9794,7 @@ NAME="LDAPADMINDN" >ldap admin dn (G)</DT ><DD ><P -> The <TT +>The <TT CLASS="PARAMETER" ><I >ldap admin dn</I @@ -9796,16 +9820,46 @@ CLASS="COMMAND" >smbpasswd(8)</B ></A > man - page for more information on how to accmplish this. + page for more information on how to accomplish this. + </P +></DD +><DT +><A +NAME="LDAPDELETEDN" +></A +>>ldap del only sam attr (G)</DT +><DD +><P +> This parameter specifies whether a delete + operation in the ldapsam deletes the complete entry or only the attributes + specific to Samba. </P ><P >Default : <I CLASS="EMPHASIS" ->none</I +>ldap delete dn = no</I ></P ></DD ><DT ><A +NAME="LDAPDELONLYSAMATTR" +></A +>>ldap del only sam attr (G)</DT +><DD +><P +> Inverted synonym for <A +HREF="#LDAPDELETEDN" +><TT +CLASS="PARAMETER" +><I +> ldap delete dn</I +></TT +></A +>. + </P +></DD +><DT +><A NAME="LDAPFILTER" ></A >ldap filter (G)</DT @@ -13724,7 +13778,7 @@ CLASS="COMMAND" ><B CLASS="COMMAND" >unixsam</B -> - Allows samba to map all (other) available unix users</P +> - (EXPERIMENTAL) Allows samba to map all (other) available unix users</P ><P >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 @@ -13743,17 +13797,17 @@ CLASS="COMMAND" ><P >Default: <B CLASS="COMMAND" ->passdb backend = smbpasswd unixsam</B +>passdb backend = smbpasswd guest</B ></P ><P >Example: <B CLASS="COMMAND" ->passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd unixsam</B +>passdb backend = tdbsam:/etc/samba/private/passdb.tdb smbpasswd:/etc/samba/smbpasswd </B ></P ><P >Example: <B CLASS="COMMAND" ->passdb backend = ldapsam_nua:ldaps://ldap.example.com unixsam</B +>passdb backend = ldapsam_nua:ldaps://ldap.example.com </B ></P ><P >Example: <B @@ -14212,7 +14266,7 @@ CLASS="PARAMETER" > and so may resolved by any method and order described in that parameter.</P ><P ->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.</P ><P @@ -19576,7 +19630,7 @@ CLASS="PARAMETER" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6195" +NAME="AEN6215" ></A ><H2 >WARNINGS</H2 @@ -19606,7 +19660,7 @@ TARGET="_top" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6201" +NAME="AEN6221" ></A ><H2 >VERSION</H2 @@ -19617,7 +19671,7 @@ NAME="AEN6201" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6204" +NAME="AEN6224" ></A ><H2 >SEE ALSO</H2 @@ -19696,7 +19750,7 @@ CLASS="COMMAND" ><DIV CLASS="REFSECT1" ><A -NAME="AEN6224" +NAME="AEN6244" ></A ><H2 >AUTHOR</H2 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. |