summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Lauria <lauria2@yahoo.com>2011-06-27 17:04:10 -0400
committerAndrew Tridgell <tridge@samba.org>2011-07-21 10:32:23 +1000
commit41b2b7e160c57a969c27a60f71c091d9c70bfd42 (patch)
tree187f65e8c22f3a22fbb61a4d60a7b8666bf3cb10
parent8c7718ac16598cc3f1dbb1d0854ef86f614b1f5d (diff)
downloadsamba-41b2b7e160c57a969c27a60f71c091d9c70bfd42.tar.gz
samba-41b2b7e160c57a969c27a60f71c091d9c70bfd42.tar.bz2
samba-41b2b7e160c57a969c27a60f71c091d9c70bfd42.zip
samba-tool: moved machinepw to domain machinepassword
This is part of the samba-tool work to fit the object-action model Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--source4/scripting/python/samba/netcmd/domain.py38
1 files changed, 37 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 6a68a2554f..aec74c46dc 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -25,7 +25,8 @@
import samba.getopt as options
import ldb
-
+import os
+from samba import Ldb
from samba.auth import system_session
from samba.samdb import SamDB
from samba.dcerpc.samr import DOMAIN_PASSWORD_COMPLEX, DOMAIN_PASSWORD_STORE_CLEARTEXT
@@ -37,6 +38,40 @@ from samba.netcmd import (
)
+
+class cmd_domain_machinepassword(Command):
+ """Gets a machine password out of our SAM"""
+
+ synopsis = "%prog domain machinepassword <accountname>"
+
+ takes_optiongroups = {
+ "sambaopts": options.SambaOptions,
+ "versionopts": options.VersionOptions,
+ "credopts": options.CredentialsOptions,
+ }
+
+ takes_args = ["secret"]
+
+ 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)
+ if not os.path.exists(url):
+ raise CommandError("secret database not found at %s " % url)
+ secretsdb = Ldb(url=url, session_info=system_session(),
+ credentials=creds, lp=lp)
+ result = secretsdb.search(attrs=["secret"],
+ expression="(&(objectclass=primaryDomain)(samaccountname=%s))" % secret)
+
+ if len(result) != 1:
+ raise CommandError("search returned %d records, expected 1" % len(result))
+
+ self.outf.write("%s\n" % result[0]["secret"])
+
+
+
class cmd_domain_passwordsettings(Command):
"""Sets password settings
@@ -209,4 +244,5 @@ class cmd_domain(SuperCommand):
"""Domain management"""
subcommands = {}
+ subcommands["machinepassword"] = cmd_domain_machinepassword()
subcommands["passwordsettings"] = cmd_domain_passwordsettings()