svn commit: samba r12252 - in branches/SAMBA_4_0/source/scripting/libjs: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-12-15 02:39:29 +0000 (Thu, 15 Dec 2005)
New Revision: 12252

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12252

Log:
With this change (hack) we can now do an provision onto Samba4's LDAP
server.  Now to try another one...

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	2005-12-15 01:52:56 UTC (rev 12251)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2005-12-15 02:39:29 UTC (rev 12252)
@@ -160,6 +160,9 @@
 	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);
 	if (res.length != 0) {
 		ldb_delete(ldb);
@@ -237,7 +240,7 @@
 	paths.hku = "hku.ldb";
 	paths.hkpd = "hkpd.ldb";
 	paths.hkpt = "hkpt.ldb";
-	paths.samdb = "sam.ldb";
+	paths.samdb = lp.get("sam database");
 	paths.secrets = "secrets.ldb";
 	paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
 	paths.winsdb = "wins.ldb";