From 744dddd75be73e4e883241b808b37a12a7a39ac1 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 4 Feb 2007 07:17:03 +0000 Subject: r21135: Instead of having hooks to update keytabs as an explicit thing, update them as a hook on ldb modify, via a module. This should allow the secrets.ldb to be edited by the admin, and to have things update in the on-disk keytab just as an in-memory keytab would. This isn't really a dsdb plugin, but I don't have any other good ideas about where to put it. Andrew Bartlett (This used to be commit 6ce557a1aff4754d2622be8f1c6695d9ee788d54) --- source4/scripting/libjs/provision.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'source4/scripting/libjs/provision.js') diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index 3e409c0dfb..23f26a6b86 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -488,16 +488,14 @@ function provision_become_dc(subobj, message, paths, session_info) assert(ok); message("Setting up " + paths.secrets + "\n"); - setup_ldb("secrets.ldif", info, paths.secrets); + setup_ldb("secrets_init.ldif", info, paths.secrets); + + setup_ldb("secrets.ldif", info, paths.secrets, false); 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); @@ -547,12 +545,9 @@ function provision(subobj, message, blank, paths, session_info, credentials, lda 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 " + paths.secrets + "\n"); + setup_ldb("secrets_init.ldif", info, paths.secrets); + setup_ldb("secrets.ldif", info, paths.secrets, false); message("Setting up hklm.ldb\n"); setup_ldb("hklm.ldif", info, paths.hklm); -- cgit