diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-02 15:47:44 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 15:02:39 +1000 |
| commit | 1565da76947f91add10a54096cdfe2ab67917b32 (patch) | |
| tree | 7aa0e9b7f241df5b25aa66c2ca7b67b33f546983 /source4/scripting | |
| parent | c091a92be51e8c14bf0b51ab83319fbcb704c91f (diff) | |
| download | samba-1565da76947f91add10a54096cdfe2ab67917b32.tar.gz samba-1565da76947f91add10a54096cdfe2ab67917b32.tar.bz2 samba-1565da76947f91add10a54096cdfe2ab67917b32.zip | |
s4-param Remove 'secrets database' parameter
This is now just secrets.ldb in the private dir, which remains.
Diffstat (limited to 'source4/scripting')
| -rwxr-xr-x | source4/scripting/bin/samba_spnupdate | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate index fe3fcfc675..9f8f4073d3 100755 --- 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 fffd352071..b99eec9ab8 100644 --- 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") |