samba-tool: Fix domain machinepassword secret db search
authorGiampaolo Lauria <lauria2@yahoo.com>
Tue, 1 Nov 2011 19:28:54 +0000 (15:28 -0400)
committerAndrew Tridgell <tridge@samba.org>
Thu, 10 Nov 2011 03:24:21 +0000 (14:24 +1100)
pair programmed with Jelmer Vernooij
Add search to include secrets.ldb

source4/scripting/python/samba/netcmd/domain.py

index 9aaecd563c455a92ffe0f6fdfdf0aef046eaeaef..af86a44d6dee24601bde663739227d412fc9a0ed 100644 (file)
@@ -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(),