sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-16 20:59:12 +03:00
Code Activity

r19252: - fixed 'erase' argument to setup_ldb()

Browse Source 
- when wiping a ldb, wipe within each naming context first. By not
  wiping the naming contexts we didn't wipe the partitions, which
  caused a massive slowdown in re-provisioning due to re-indexing of
  the schema.
(This used to be commit b62437214c)
This commit is contained in:
Andrew Tridgell
2006-10-12 08:32:58 +00:00
committed by Gerald (Jerry) Carter
parent 49eb5dc142
commit 151e30e18a
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source4/scripting/libjs/provision.js
View File

@ -157,7 +157,24 @@ function ldb_delete(ldb)
*/
function ldb_erase(ldb)
{
var attrs = new Array("dn");
var attrs = new Array("namingContexts");
var res;
/* delete within each naming context - this copes with existing partitions */
res = ldb.search("objectClass=*", "", ldb.SCOPE_BASE, attrs);
if (typeof(res) != "undefined") {
if (res.length > 0) {
var names = res[0].namingContexts;
for (i=0;i<names.length;i++) {
attrs = new Array("dn");
res = ldb.search("(objectclass=*)", names[i], ldb.SCOPE_SUBTREE, attrs);
var j;
for (j=0;j<res.length;j++) {
ldb.del(res[j].dn);
}
}
}
}
/* delete the specials */
ldb.del("@INDEXLIST");
@ -168,6 +185,7 @@ function ldb_erase(ldb)
ldb.del("@KLUDGEACL");
/* and the rest */
attrs = new Array("dn");
var basedn = "";
var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
var i;
@ -179,6 +197,7 @@ function ldb_erase(ldb)
ldb.del(res[i].dn);
}
var res = ldb.search("(&(|(objectclass=*)(dn=*))(!(dn=@BASEINFO)))", basedn, ldb.SCOPE_SUBTREE, attrs);
if (res.length != 0) {
ldb_delete(ldb);
@ -292,7 +311,7 @@ function setup_ldb(ldif, info, dbname)
failok = arguments[4];
}
var ldb = open_ldb(info, dbname, erase);
if (setup_add_ldif(ldif, info, ldb, erase, failok)) {
if (setup_add_ldif(ldif, info, ldb, failok)) {
var commit_ok = ldb.transaction_commit();
if (!commit_ok) {
info.message("ldb commit failed: " + ldb.errstring() + "\n");