summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-09-05 10:45:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:11 -0500
commit3a70ec899a2d408bfc11cc21a3f470d22c080c15 (patch)
tree70fd32d9bf09b7692d051fc520a5051905eab2d5
parentc3b54cf75b6aaa5448afbd4e3fd68b31d69e35fd (diff)
downloadsamba-3a70ec899a2d408bfc11cc21a3f470d22c080c15.tar.gz
samba-3a70ec899a2d408bfc11cc21a3f470d22c080c15.tar.bz2
samba-3a70ec899a2d408bfc11cc21a3f470d22c080c15.zip
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 1a111817a361faab04e73b666624ce554f000034)
-rw-r--r--source4/scripting/libjs/provision.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index cd09962931..ea0f138260 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -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;