From e573037ac547905d1e57b22602bcfce55889dde7 Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Mon, 27 Jun 2011 17:06:35 -0400 Subject: [PATCH] samba-tool: removed machinepw as it has been moved to domain machinepassword The functionality of machinepwd has been moved to "domain machinepassword" to fit the object-action model Signed-off-by: Andrew Tridgell --- source4/scripting/python/samba/netcmd/__init__.py | 2 - source4/scripting/python/samba/netcmd/machinepw.py | 56 ---------------------- 2 files changed, 58 deletions(-) delete mode 100644 source4/scripting/python/samba/netcmd/machinepw.py diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py index cbb3c5a857f..6c502c8238d 100644 --- a/source4/scripting/python/samba/netcmd/__init__.py +++ b/source4/scripting/python/samba/netcmd/__init__.py @@ -190,8 +190,6 @@ from samba.netcmd.user import cmd_user commands["user"] = cmd_user() from samba.netcmd.vampire import cmd_vampire commands["vampire"] = cmd_vampire() -from samba.netcmd.machinepw import cmd_machinepw -commands["machinepw"] = cmd_machinepw() from samba.netcmd.spn import cmd_spn commands["spn"] = cmd_spn() from samba.netcmd.group import cmd_group diff --git a/source4/scripting/python/samba/netcmd/machinepw.py b/source4/scripting/python/samba/netcmd/machinepw.py deleted file mode 100644 index 75338d95ef5..00000000000 --- a/source4/scripting/python/samba/netcmd/machinepw.py +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python -# -# Machine passwords -# Copyright Jelmer Vernooij 2010 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -import samba.getopt as options -import os -from samba import Ldb -from samba.auth import system_session -from samba.netcmd import Command, CommandError - - -class cmd_machinepw(Command): - """Gets a machine password out of our SAM""" - - synopsis = "%prog machinepw " - - 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"]) -- 2.11.4.GIT