diff options
| author | Volker Lendecke <vlendec@samba.org> | 2003-03-23 09:18:33 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2003-03-23 09:18:33 +0000 |
| commit | 3970ad75b8c8085a03641136d2b497e5e844f07f (patch) | |
| tree | c9ccbc70938d07c33219b44cbbe7799aeaa0b69c /docs/docbook/manpages/smb.conf.5.sgml | |
| parent | 42ba08260a5677ff2ab2e7ef666b74e25e458b2b (diff) | |
| download | samba-3970ad75b8c8085a03641136d2b497e5e844f07f.tar.gz samba-3970ad75b8c8085a03641136d2b497e5e844f07f.tar.bz2 samba-3970ad75b8c8085a03641136d2b497e5e844f07f.zip | |
Merge from HEAD:
This adds 'ldap delete dn' as the recommended parameter
for the 'ldap del only sam attr' functionality. So
we are compatiple to the current SuSE patches as well
as to TNG... ;-)
Volker
(This used to be commit 53b5704ff21de6fce097d74dd7f235d3ceccec66)
Diffstat (limited to 'docs/docbook/manpages/smb.conf.5.sgml')
| -rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index 08a23a22bd..c45b698a41 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -657,6 +657,7 @@ <listitem><para><link linkend="LARGEREADWRITE"><parameter>large readwrite</parameter></link></para></listitem> <listitem><para><link linkend="LDAPADMINDN"><parameter>ldap admin dn</parameter></link></para></listitem> + <listitem><para><link linkend="LDAPDELETEDN"><parameter>ldap delete dn</parameter></link></para></listitem> <listitem><para><link linkend="LDAPDELONLYSAMATTR"><parameter>ldap del only sam attr</parameter></link></para></listitem> <listitem><para><link linkend="LDAPFILTER"><parameter>ldap filter</parameter></link></para></listitem> <listitem><para><link linkend="LDAPPORT"><parameter>ldap port</parameter></link></para></listitem> @@ -3434,17 +3435,25 @@ </para> <varlistentry> - <term><anchor id="LDAPDELONLYSAMATTR"/>ldap del only sam attr (G)</term> + <term><anchor id="LDAPDELETEDN"/>ldap del only sam attr (G)</term> <listitem><para> This parameter specifies whether a delete - operation in the ldapsam deletes only the Samba-specific - attributes or the complete LDAP entry. + operation in the ldapsam deletes the complete entry or only the attributes + specific to Samba. </para> - <para>Default : <emphasis>ldap del only sam attr = yes</emphasis></para> + <para>Default : <emphasis>ldap delete dn = no</emphasis></para> </listitem> </varlistentry> + <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> + </para> + </listitem> + </varlistentry> + <varlistentry> |