summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2012-02-17 21:24:48 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2012-02-17 21:36:56 +0100
commitfa89f2756f2d56ff83a5a6646ccff759b03f900d (patch)
tree2bcba087aeed5854651da5ba06328c738916230a
parent476d503d246a563c552a3ba8d7fe3230bec5914e (diff)
downloadsamba-fa89f2756f2d56ff83a5a6646ccff759b03f900d.tar.gz
samba-fa89f2756f2d56ff83a5a6646ccff759b03f900d.tar.bz2
samba-fa89f2756f2d56ff83a5a6646ccff759b03f900d.zip
s4:samba-tool fsmo * - fix missing "takes_optiongroups"
This has been reported in bug #8755. Reviewed-by: Jelmer
-rw-r--r--source4/scripting/python/samba/netcmd/fsmo.py12
-rwxr-xr-xsource4/utils/tests/test_samba_tool.sh2
2 files changed, 14 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/source4/scripting/python/samba/netcmd/fsmo.py
index 958e5b8719..f4e03b2af6 100644
--- a/source4/scripting/python/samba/netcmd/fsmo.py
+++ b/source4/scripting/python/samba/netcmd/fsmo.py
@@ -125,6 +125,12 @@ class cmd_fsmo_show(Command):
synopsis = "%prog [options]"
+ takes_optiongroups = {
+ "sambaopts": options.SambaOptions,
+ "credopts": options.CredentialsOptions,
+ "versionopts": options.VersionOptions,
+ }
+
takes_options = [
Option("-H", "--URL", help="LDB URL for database or target server", type=str,
metavar="URL", dest="H"),
@@ -182,6 +188,12 @@ class cmd_fsmo_transfer(Command):
synopsis = "%prog [options]"
+ takes_optiongroups = {
+ "sambaopts": options.SambaOptions,
+ "credopts": options.CredentialsOptions,
+ "versionopts": options.VersionOptions,
+ }
+
takes_options = [
Option("-H", "--URL", help="LDB URL for database or target server", type=str,
metavar="URL", dest="H"),
diff --git a/source4/utils/tests/test_samba_tool.sh b/source4/utils/tests/test_samba_tool.sh
index 0e03ee4d75..7057312fcb 100755
--- a/source4/utils/tests/test_samba_tool.sh
+++ b/source4/utils/tests/test_samba_tool.sh
@@ -40,4 +40,6 @@ testit "domain level.show" $VALGRIND $samba_tool domain level show
testit "domain info" $VALGRIND $samba_tool domain info $SERVER_IP
+testit "fsmo show" $VALGRIND $samba_tool fsmo show
+
exit $failed