s4:samba-tool fsmo * - fix missing "takes_optiongroups"

This has been reported in bug #8755. Reviewed-by: Jelmer
whyshan · Feb 17, 2012 · fa89f27 · fa89f27
1 parent 476d503
commit fa89f27
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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