Author: abartlet Date: 2006-09-05 10:45:05 +0000 (Tue, 05 Sep 2006) New Revision: 18072
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18072 Log: Really delete things in the base partition, after we changed where the default search scope points to. Andrew Bartlett Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js Changeset: Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js =================================================================== --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2006-09-05 10:40:22 UTC (rev 18071) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2006-09-05 10:45:05 UTC (rev 18072) @@ -168,7 +168,8 @@ ldb.del("@KLUDGEACL"); /* and the rest */ - var res = ldb.search("(&(|(objectclass=*)(dn=*))(!([EMAIL PROTECTED])))", attrs); + var basedn = ""; + var res = ldb.search("(&(|(objectclass=*)(dn=*))(!([EMAIL PROTECTED])))", basedn, ldb.SCOPE_SUBTREE, attrs); var i; if (typeof(res) == "undefined") { ldb_delete(ldb); @@ -177,10 +178,8 @@ 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=*))(!([EMAIL PROTECTED])))", attrs); + var res = ldb.search("(&(|(objectclass=*)(dn=*))(!([EMAIL PROTECTED])))", basedn, ldb.SCOPE_SUBTREE, attrs); if (res.length != 0) { ldb_delete(ldb); return;
