samba-tool: Change internal argument name in domain machinepassword
authorGiampaolo Lauria <lauria2@yahoo.com>
Mon, 7 Nov 2011 18:39:07 +0000 (13:39 -0500)
committerAndrew Tridgell <tridge@samba.org>
Thu, 10 Nov 2011 03:24:21 +0000 (14:24 +1100)
source4/scripting/python/samba/netcmd/domain.py

index af86a44d6dee24601bde663739227d412fc9a0ed..871f72f952bc54c9a594d6c57efc9faf25f02146 100644 (file)
@@ -341,20 +341,20 @@ class cmd_domain_machinepassword(Command):
 
     synopsis = "%prog <accountname> [options]"
 
-    takes_args = ["secret"]
+    takes_args = ["accountname"]
 
-    def run(self, secret, sambaopts=None, credopts=None, versionopts=None):
+    def run(self, accountname, sambaopts=None, credopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp, fallback_machine=True)
         url = lp.private_path("secrets.ldb")
         if not os.path.exists(url):
             raise CommandError("secrets database not found at %s " % url)
-        if not secret.endswith('$'):
-            secret += '$'
+        if not accountname.endswith('$'):
+            accountname += '$'
         secretsdb = Ldb(url=url, session_info=system_session(),
             credentials=creds, lp=lp)
         result = secretsdb.search(attrs=["secret"],
-            expression="(&(objectclass=primaryDomain)(samaccountname=%s))" % ldb.binary_encode(secret))
+            expression="(&(objectclass=primaryDomain)(samaccountname=%s))" % ldb.binary_encode(accountname))
 
         if len(result) != 1:
             raise CommandError("search returned %d records, expected 1" % len(result))