summaryrefslogtreecommitdiff
path: root/source4/scripting/libjs
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-01-15 14:17:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:43:33 -0500
commit9f802707d8623955c3ef173125e0837f6daa89cd (patch)
treef9f00c4978c30a0dfde41bc8e439cdb4beebd616 /source4/scripting/libjs
parent03d2647bd002aff10e463ad45e26bce8148e1b49 (diff)
downloadsamba-9f802707d8623955c3ef173125e0837f6daa89cd.tar.gz
samba-9f802707d8623955c3ef173125e0837f6daa89cd.tar.bz2
samba-9f802707d8623955c3ef173125e0837f6daa89cd.zip
r20806: make it possible to configure the secrets.ldb url
via "secrets database = my_secrets.ldb" metze (This used to be commit a096a9741597105140845f59e54a76060da0010b)
Diffstat (limited to 'source4/scripting/libjs')
-rw-r--r--source4/scripting/libjs/provision.js19
1 files changed, 18 insertions, 1 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index e9261888c6..1dbe08427e 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -381,7 +381,7 @@ function provision_default_paths(subobj)
paths.hkpd = "hkpd.ldb";
paths.hkpt = "hkpt.ldb";
paths.samdb = lp.get("sam database");
- paths.secrets = "secrets.ldb";
+ paths.secrets = lp.get("secrets database");
paths.keytab = "secrets.keytab";
paths.dns = lp.get("private dir") + "/" + subobj.DNSDOMAIN + ".zone";
paths.winsdb = "wins.ldb";
@@ -484,6 +484,20 @@ function provision_become_dc(subobj, message, paths, session_info)
ok = samdb.transaction_commit();
assert(ok);
+ message("Setting up " + paths.secrets + "\n");
+ setup_ldb("secrets.ldif", info, paths.secrets);
+
+ tmp = lp.get("secrets database");
+ ok = lp.set("secrets database", paths.secrets);
+ assert(ok);
+
+ message("Setting up keytabs\n");
+ var keytab_ok = credentials_update_all_keytabs();
+ assert(keytab_ok);
+
+ ok = lp.set("secrets database", tmp);
+ assert(ok);
+
return true;
}
@@ -529,11 +543,14 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda
message("Setting up share.ldb\n");
setup_ldb("share.ldif", info, paths.shareconf);
}
+
message("Setting up secrets.ldb\n");
setup_ldb("secrets.ldif", info, paths.secrets);
+
message("Setting up keytabs\n");
var keytab_ok = credentials_update_all_keytabs();
assert(keytab_ok);
+
message("Setting up hklm.ldb\n");
setup_ldb("hklm.ldif", info, paths.hklm);