From 3a70ec899a2d408bfc11cc21a3f470d22c080c15 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 5 Sep 2006 10:45:05 +0000
Subject: 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)
---
 source4/scripting/libjs/provision.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

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;
-- 
cgit