The branch, master has been updated via f8ef240 samba-tool sites: Re-add support for option groups via 8613bc7 samba-tool dns: Re-add support for option groups from 502186f Remove unused get_file_size() function.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f8ef24083193ee2dade7884178f583ecb204684c Author: Amitay Isaacs <ami...@gmail.com> Date: Tue Feb 7 17:30:22 2012 +1100 samba-tool sites: Re-add support for option groups Autobuild-User: Amitay Isaacs <ami...@samba.org> Autobuild-Date: Wed Feb 8 02:27:28 CET 2012 on sn-devel-104 commit 8613bc7ea1bbeec7c5b2c511fe7e601eea10c41e Author: Amitay Isaacs <ami...@gmail.com> Date: Tue Feb 7 17:27:18 2012 +1100 samba-tool dns: Re-add support for option groups ----------------------------------------------------------------------- Summary of changes: source4/scripting/python/samba/netcmd/dns.py | 60 ++++++++++++++++++++++++ source4/scripting/python/samba/netcmd/sites.py | 13 +++++ 2 files changed, 73 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/netcmd/dns.py b/source4/scripting/python/samba/netcmd/dns.py index 2ab4129..6d07db4 100644 --- a/source4/scripting/python/samba/netcmd/dns.py +++ b/source4/scripting/python/samba/netcmd/dns.py @@ -513,6 +513,12 @@ class cmd_serverinfo(Command): takes_args = [ 'server' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_options = [ Option('--client-version', help='Client Version', default='longhorn', metavar='w2k|dotnet|longhorn', @@ -541,6 +547,12 @@ class cmd_zoneinfo(Command): takes_args = [ 'server', 'zone' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_options = [ Option('--client-version', help='Client Version', default='longhorn', metavar='w2k|dotnet|longhorn', @@ -569,6 +581,12 @@ class cmd_zonelist(Command): takes_args = [ 'server' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_options = [ Option('--client-version', help='Client Version', default='longhorn', metavar='w2k|dotnet|longhorn', @@ -644,6 +662,12 @@ class cmd_zonecreate(Command): takes_args = [ 'server', 'zone' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_options = [ Option('--client-version', help='Client Version', default='longhorn', metavar='w2k|dotnet|longhorn', @@ -702,6 +726,12 @@ class cmd_zonedelete(Command): takes_args = [ 'server', 'zone' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + def run(self, server, zone, sambaopts=None, credopts=None, versionopts=None): self.lp = sambaopts.get_loadparm() @@ -727,6 +757,12 @@ class cmd_query(Command): takes_args = [ 'server', 'zone', 'name', 'rtype' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + takes_options = [ Option('--authority', help='Search authoritative records (default)', action='store_true', dest='authority'), @@ -797,6 +833,12 @@ class cmd_roothints(Command): takes_args = [ 'server', 'name?' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + def run(self, server, name='.', sambaopts=None, credopts=None, versionopts=None): record_type = dnsp.DNS_TYPE_NS select_flags = (dnsserver.DNS_RPC_VIEW_ROOT_HINT_DATA | @@ -826,6 +868,12 @@ class cmd_add_record(Command): takes_args = [ 'server', 'zone', 'name', 'rtype', 'data' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + def run(self, server, zone, name, rtype, data, sambaopts=None, credopts=None, versionopts=None): record_type = dns_type_flag(rtype) @@ -871,6 +919,12 @@ class cmd_update_record(Command): takes_args = [ 'server', 'zone', 'name', 'rtype', 'olddata', 'newdata' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + def run(self, server, zone, name, rtype, olddata, newdata, sambaopts=None, credopts=None, versionopts=None): @@ -925,6 +979,12 @@ class cmd_delete_record(Command): takes_args = [ 'server', 'zone', 'name', 'rtype', 'data' ] + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + def run(self, server, zone, name, rtype, data, sambaopts=None, credopts=None, versionopts=None): record_type = dns_type_flag(rtype) diff --git a/source4/scripting/python/samba/netcmd/sites.py b/source4/scripting/python/samba/netcmd/sites.py index f5223db..5cbc09c 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) -- Samba Shared Repository