From: Amitay Isaacs <amitay@gmail.com>
Date: Tue, 7 Feb 2012 06:30:22 +0000 (+1100)
Subject: samba-tool sites: Re-add support for option groups
X-Git-Tag: tevent-0.9.15~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8ef24083193ee2dade7884178f583ecb204684c;p=thirdparty%2Fsamba.git

samba-tool sites: Re-add support for option groups

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Wed Feb  8 02:27:28 CET 2012 on sn-devel-104
---

diff --git a/source4/scripting/python/samba/netcmd/sites.py b/source4/scripting/python/samba/netcmd/sites.py
index f5223db5f86..5cbc09c1051 100644
--- a/source4/scripting/python/samba/netcmd/sites.py
+++ b/source4/scripting/python/samba/netcmd/sites.py
@@ -24,6 +24,7 @@
 import os
 from samba import sites
 from samba.samdb import SamDB
+import samba.getopt as options
 from samba.auth import system_session
 from samba.netcmd import (
     Command,
@@ -39,6 +40,12 @@ class cmd_sites_create(Command):
 
     takes_args = ["sitename"]
 
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
+
     def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp, fallback_machine=True)
@@ -66,6 +73,12 @@ class cmd_sites_delete(Command):
 
     takes_args = ["sitename"]
 
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptions,
+    }
+
     def run(self, sitename, sambaopts=None, credopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp, fallback_machine=True)