svn commit: samba r8570 - in
branches/SAMBA_4_0/source/scripting/libjs: .
tridge at samba.org
tridge at samba.org
Tue Jul 19 02:10:10 GMT 2005
Author: tridge
Date: 2005-07-19 02:10:08 +0000 (Tue, 19 Jul 2005)
New Revision: 8570
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8570
Log:
delete all records in the old db when provisioning, rather than using
sys.unlink(). This allows smbd to see the new db without restarting.
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 2005-07-19 02:09:05 UTC (rev 8569)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2005-07-19 02:10:08 UTC (rev 8570)
@@ -111,6 +111,30 @@
/*
+ erase an ldb, removing all records
+*/
+function ldb_erase(ldb)
+{
+ var attrs = new Array("dn");
+
+ /* delete the specials */
+ ldb.del("@INDEXLIST");
+ ldb.del("@ATTRIBUTES");
+ ldb.del("@SUBCLASSES");
+ ldb.del("@MODULES");
+
+ /* and the rest */
+ var res = ldb.search("(|(objectclass=*)(dn=*))", attrs);
+ var i;
+ for (i=0;i<res.length;i++) {
+ ldb.del(res[i].dn);
+ }
+ res = ldb.search("(objectclass=*)", attrs);
+ assert(res.length == 0);
+}
+
+
+/*
setup a ldb in the private dir
*/
function setup_ldb(ldif, dbname, subobj)
@@ -125,8 +149,6 @@
var dbfile = lpGet("private dir") + "/" + dbname;
var src = lpGet("setup directory") + "/" + ldif;
- sys.unlink(dbfile);
-
var data = sys.file_load(src);
data = data + extra;
data = substitute_var(data, subobj);
@@ -134,6 +156,8 @@
var ok = ldb.connect(dbfile);
assert(ok);
+ ldb_erase(ldb);
+
ok = ldb.add(data);
assert(ok);
}
More information about the samba-cvs
mailing list