From a0ff4c349c6b75f9e5fa6b4ad0e69a4aa8e471b0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 6 Feb 2012 16:33:38 +0100 Subject: 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 --- source4/scripting/python/samba/netcmd/ldapcmp.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source4/scripting/python/samba/netcmd/ldapcmp.py') diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/source4/scripting/python/samba/netcmd/ldapcmp.py index a6db4b11b02..75708decd01 100755 --- a/source4/scripting/python/samba/netcmd/ldapcmp.py +++ b/source4/scripting/python/samba/netcmd/ldapcmp.py @@ -8,7 +8,6 @@ # above partitions. # Copyright (C) Zahari Zahariev 2009, 2010 -# Copyright Giampaolo Lauria 2011 # # 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 @@ -863,6 +862,12 @@ class cmd_ldapcmp(Command): "credopts": options.CredentialsOptionsDouble, } + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptionsDouble, + } + takes_args = ["URL1", "URL2", "context1?", "context2?", "context3?"] takes_options = [ -- cgit