summaryrefslogtreecommitdiff
path: root/docs/docbook/manpages
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-03-31 01:57:15 +0000
committerGerald Carter <jerry@samba.org>2003-03-31 01:57:15 +0000
commit88f780f0cfe16d2155f68a44122974b96e25d555 (patch)
tree374028cdf8348c38f58dabd75fdda29fe8829730 /docs/docbook/manpages
parenta97a1d5fed2af91ba4d2c5cf2c82140aef98989d (diff)
downloadsamba-88f780f0cfe16d2155f68a44122974b96e25d555.tar.gz
samba-88f780f0cfe16d2155f68a44122974b96e25d555.tar.bz2
samba-88f780f0cfe16d2155f68a44122974b96e25d555.zip
updated passdb backend parameter
(This used to be commit 36a1fea696ca2c729c0f2e71d4587fafdc3daf94)
Diffstat (limited to 'docs/docbook/manpages')
-rw-r--r--docs/docbook/manpages/pdbedit.8.sgml1
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml18
2 files changed, 11 insertions, 8 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>