mirror of
https://github.com/samba-team/samba.git
synced 2025-07-23 20:59:10 +03:00
r18072: Really delete things in the base partition, after we changed where the
default search scope points to.
Andrew Bartlett
(This used to be commit 1a111817a3
)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
c3b54cf75b
commit
3a70ec899a
@ -168,7 +168,8 @@ function ldb_erase(ldb)
|
||||
ldb.del("@KLUDGEACL");
|
||||
|
||||
/* and the rest */
|
||||
var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
|
||||
var basedn = "";
|
||||
var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
|
||||
var i;
|
||||
if (typeof(res) == "undefined") {
|
||||
ldb_delete(ldb);
|
||||
@ -177,10 +178,8 @@ function ldb_erase(ldb)
|
||||
for (i=0;i<res.length;i++) {
|
||||
ldb.del(res[i].dn);
|
||||
}
|
||||
/* extra hack to ensure it's gone on remote ldap */
|
||||
ldb.del("cn=ROOTDSE");
|
||||
|
||||
var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", attrs);
|
||||
var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
|
||||
if (res.length != 0) {
|
||||
ldb_delete(ldb);
|
||||
return;
|
||||
|
Reference in New Issue
Block a user