s4-param Remove 'secrets database' parameter

This is now just secrets.ldb in the private dir, which remains.

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index b9b267794724c3380ab02de8c703b78dc8079ad2..e53d1cb447eb6ba69b85f6947a39417aa814afe9 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -95,7 +95,6 @@ struct loadparm_global
        char *szPasswdChat;
        char *szShareBackend;
        char *szIDMAP_URL;
-       char *szSECRETS_URL;
        char *szSPOOLSS_URL;
        char *szWINS_CONFIG_URL;
        char *szWINS_URL;
@@ -372,7 +371,6 @@ static struct parm_struct parm_table[] = {
        {"obey pam restrictions", P_BOOL, P_GLOBAL, GLOBAL_VAR(bObeyPamRestrictions), NULL, NULL},
        {"password server", P_LIST, P_GLOBAL, GLOBAL_VAR(szPasswordServers), NULL, NULL},
        {"idmap database", P_STRING, P_GLOBAL, GLOBAL_VAR(szIDMAP_URL), NULL, NULL},
-       {"secrets database", P_STRING, P_GLOBAL, GLOBAL_VAR(szSECRETS_URL), NULL, NULL},
        {"spoolss database", P_STRING, P_GLOBAL, GLOBAL_VAR(szSPOOLSS_URL), NULL, NULL},
        {"wins config database", P_STRING, P_GLOBAL, GLOBAL_VAR(szWINS_CONFIG_URL), NULL, NULL},
        {"wins database", P_STRING, P_GLOBAL, GLOBAL_VAR(szWINS_URL), NULL, NULL},
@@ -654,7 +652,6 @@ FN_GLOBAL_BOOL(tls_enabled, tls_enabled)
 FN_GLOBAL_STRING(logfile, logfile)
 FN_GLOBAL_STRING(share_backend, szShareBackend)
 FN_GLOBAL_STRING(idmap_url, szIDMAP_URL)
-FN_GLOBAL_STRING(secrets_url, szSECRETS_URL)
 FN_GLOBAL_STRING(spoolss_url, szSPOOLSS_URL)
 FN_GLOBAL_STRING(wins_config_url, szWINS_CONFIG_URL)
 FN_GLOBAL_STRING(wins_url, szWINS_URL)
@@ -2435,7 +2432,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "auth methods:standalone", "anonymous sam_ignoredomain");
        lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR);
        lpcfg_do_global_parameter(lp_ctx, "idmap database", "idmap.ldb");
-       lpcfg_do_global_parameter(lp_ctx, "secrets database", "secrets.ldb");
        lpcfg_do_global_parameter(lp_ctx, "spoolss database", "spoolss.ldb");
        lpcfg_do_global_parameter(lp_ctx, "wins config database", "wins_config.ldb");
        lpcfg_do_global_parameter(lp_ctx, "wins database", "wins.ldb");

diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 287b2c7281072cd30b7ce40e8ccbce935f7746f9..55d1aa779b261e6a33391d2e3fd56eda5490078b 100644 (file)
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -88,7 +88,7 @@ bool randseed_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx,
                                        struct loadparm_context *lp_ctx)
 {
-       return ldb_wrap_connect(mem_ctx, NULL, lp_ctx, lpcfg_secrets_url(lp_ctx),
+       return ldb_wrap_connect(mem_ctx, NULL, lp_ctx, "secrets.ldb",
                               NULL, NULL, 0);
 }
 

diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate
index fe3fcfc6759c0b40c3c55f0c8382863037e9cabd..9f8f4073d3118c2976fd79be1132da1d5a23ae51 100755 (executable)
--- a/source4/scripting/bin/samba_spnupdate
+++ b/source4/scripting/bin/samba_spnupdate
@@ -82,7 +82,7 @@ def get_subst_vars(samdb):
 
 try:
     private_dir = lp.get("private dir")
-    secrets_path = os.path.join(private_dir, lp.get("secrets database"))
+    secrets_path = os.path.join(private_dir, "secrets.ldb")
 
     secrets_db = Ldb(url=secrets_path, session_info=system_session(),
                      credentials=creds, lp=lp)

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index fffd352071ff759eb0eb4c059da76b595d9f008a..b99eec9ab86ebba95f298fcce6b9b307b63e3710 100644 (file)
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -520,8 +520,7 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.samdb = os.path.join(paths.private_dir, "sam.ldb")
     paths.idmapdb = os.path.join(paths.private_dir,
         lp.get("idmap database") or "idmap.ldb")
-    paths.secrets = os.path.join(paths.private_dir,
-        lp.get("secrets database") or "secrets.ldb")
+    paths.secrets = os.path.join(paths.private_dir, "secrets.ldb")
     paths.privilege = os.path.join(paths.private_dir, "privilege.ldb")
     paths.dns = os.path.join(paths.private_dir, "dns", dnsdomain + ".zone")
     paths.dns_update_list = os.path.join(paths.private_dir, "dns_update_list")