r12252: With this change (hack) we can now do an provision onto Samba4's LDAP

server.  Now to try another one...

Andrew Bartlett

diff --git a/source/scripting/libjs/provision.js b/source/scripting/libjs/provision.js
index aa4ea5bff80253cccfb728634851b6e66d38955f..4cd9e5fa8dd6a1f976c34daa63d27c6dd4fe2ddf 100644 (file)
--- a/source/scripting/libjs/provision.js
+++ b/source/scripting/libjs/provision.js
@@ -160,6 +160,9 @@ 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);
        if (res.length != 0) {
                ldb_delete(ldb);
@@ -237,7 +240,7 @@ function provision_default_paths(subobj)
        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";