diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-02-06 16:33:38 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-02-07 01:11:08 +0100 |
| commit | a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0 (patch) | |
| tree | f061638bef13c1f55a7444c7dfdf6d7c1995ec16 /source4/scripting/python/samba/netcmd/drs.py | |
| parent | d6b47015037cbdebc3cd1c1f352cf7c6109bead3 (diff) | |
| download | samba-a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0.tar.gz samba-a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0.tar.bz2 samba-a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0.zip | |
Revert "samba-tool: moved takes_optiongroups definition to Command base class"
This reverts commit f6fa8684896b8f3f9f8b7bd3742c99906973274c.
This keeps the main command class fairly slim, and makes it a bit
more obvious where the arguments to run() are coming from.
Conflicts:
source4/scripting/python/samba/netcmd/__init__.py
source4/scripting/python/samba/netcmd/domain.py
source4/scripting/python/samba/netcmd/gpo.py
source4/scripting/python/samba/netcmd/newuser.py
source4/scripting/python/samba/netcmd/testparm.py
source4/scripting/python/samba/netcmd/user.py
source4/scripting/python/samba/tests/samba_tool/__init__.py
Diffstat (limited to 'source4/scripting/python/samba/netcmd/drs.py')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/drs.py | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py index 0d93298e97..0b367e3cd1 100644 --- a/source4/scripting/python/samba/netcmd/drs.py +++ b/source4/scripting/python/samba/netcmd/drs.py @@ -3,7 +3,6 @@ # implement samba_tool drs commands # # Copyright Andrew Tridgell 2010 -# Copyright Giampaolo Lauria 2011 <lauria2@yahoo.com> # # based on C implementation by Kamen Mazdrashki <kamen.mazdrashki@postpath.com> # @@ -87,6 +86,12 @@ class cmd_drs_showrepl(Command): synopsis = "%prog [<DC>] [options]" + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_args = ["DC?"] def print_neighbour(self, n): @@ -192,6 +197,12 @@ class cmd_drs_kcc(Command): synopsis = "%prog [<DC>] [options]" + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_args = ["DC?"] def run(self, DC=None, sambaopts=None, @@ -255,6 +266,12 @@ class cmd_drs_replicate(Command): synopsis = "%prog <destinationDC> <sourceDC> <NC> [options]" + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_args = ["DEST_DC", "SOURCE_DC", "NC"] takes_options = [ @@ -325,6 +342,12 @@ class cmd_drs_bind(Command): synopsis = "%prog [<DC>] [options]" + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_args = ["DC?"] def run(self, DC=None, sambaopts=None, @@ -418,6 +441,12 @@ class cmd_drs_options(Command): synopsis = "%prog [<DC>] [options]" + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_args = ["DC?"] takes_options = [ |