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 /source3/passdb | |
parent | 42ba08260a5677ff2ab2e7ef666b74e25e458b2b (diff) | |
download | samba-3970ad75b8c8085a03641136d2b497e5e844f07f.tar.gz samba-3970ad75b8c8085a03641136d2b497e5e844f07f.tar.xz 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 'source3/passdb')
-rw-r--r-- | source3/passdb/pdb_ldap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index f00abe7cabf..6baff9029fa 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -849,7 +849,7 @@ static void make_a_mod (LDAPMod *** modlist, int modop, const char *attribute, c /******************************************************************* Delete complete object or objectclass and attrs from - object found in search_result depending on lp_ldap_del_only_sam + object found in search_result depending on lp_ldap_delete_dn ******************************************************************/ static NTSTATUS ldapsam_delete_entry(struct ldapsam_privates *ldap_state, LDAPMessage *result, @@ -872,7 +872,7 @@ static NTSTATUS ldapsam_delete_entry(struct ldapsam_privates *ldap_state, entry = ldap_first_entry(ldap_state->ldap_struct, result); dn = ldap_get_dn(ldap_state->ldap_struct, entry); - if (!lp_ldap_del_only_sam()) { + if (lp_ldap_delete_dn()) { NTSTATUS ret = NT_STATUS_OK; rc = ldapsam_delete(ldap_state, dn); |