summaryrefslogtreecommitdiff
path: root/source4/scripting/bin
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-01-28 16:39:03 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-01-28 16:39:03 +1100
commitc16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67 (patch)
tree8efaf6b885543a006a91294923324fc580d01bbf /source4/scripting/bin
parent11061499e182b9c41ec793d4eefb8a2cf7c88bfe (diff)
parentcab677a33f0376cd1bf96ec561dc0463bbf80edd (diff)
downloadsamba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.gz
samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.bz2
samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.zip
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)
Diffstat (limited to 'source4/scripting/bin')
-rwxr-xr-xsource4/scripting/bin/winreg.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py
index f68f2d12f2..1e39ee8f78 100755
--- a/source4/scripting/bin/winreg.py
+++ b/source4/scripting/bin/winreg.py
@@ -12,7 +12,8 @@ import optparse
import samba.getopt as options
parser = optparse.OptionParser("%s <BINDING> [path]" % sys.argv[0])
-parser.add_option_group(options.SambaOptions(parser))
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
parser.add_option("--createkey", type="string", metavar="KEYNAME",
help="create a key")
@@ -25,7 +26,7 @@ if len(args) < 1:
binding = args[0]
print "Connecting to " + binding
-conn = winreg.winreg(binding, opts.configfile)
+conn = winreg.winreg(binding, sambaopts.get_loadparm())
def list_values(key):
(num_values, max_valnamelen, max_valbufsize) = conn.QueryInfoKey(key, winreg.String())[4:8]