From 53fc437d057208d182ec0afaa087ea8791c753ca Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Tue, 1 Nov 2011 15:28:54 -0400 Subject: samba-tool: Fix domain machinepassword secret db search pair programmed with Jelmer Vernooij Add search to include secrets.ldb --- source4/scripting/python/samba/netcmd/domain.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 9aaecd563c..af86a44d6d 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -346,11 +346,9 @@ class cmd_domain_machinepassword(Command): def run(self, secret, sambaopts=None, credopts=None, versionopts=None): lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp, fallback_machine=True) - name = lp.get("secrets database") - path = lp.get("private dir") - url = os.path.join(path, name) + url = lp.private_path("secrets.ldb") if not os.path.exists(url): - raise CommandError("secret database not found at %s " % url) + raise CommandError("secrets database not found at %s " % url) if not secret.endswith('$'): secret += '$' secretsdb = Ldb(url=url, session_info=system_session(), -- cgit