sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-27 07:42:04 +03:00
Code Activity

Revert "samba-tool: moved takes_optiongroups definition to Command base class"

Browse Source 
This reverts commit f6fa868489.

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
This commit is contained in:
Jelmer Vernooij
2012-02-06 16:33:38 +01:00
parent d6b4701503
commit a0ff4c349c
17 changed files with 240 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source4/scripting/python/samba/netcmd/ldapcmp.py
View File

@ -8,7 +8,6 @@
# above partitions.
# Copyright (C) Zahari Zahariev <zahari.zahariev@postpath.com> 2009, 2010
# Copyright Giampaolo Lauria 2011 <lauria2@yahoo.com>
#
# 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 = [