diff options
| -rwxr-xr-x | source4/scripting/bin/samba3dump | 4 | ||||
| -rwxr-xr-x | source4/scripting/python/examples/samr.py (renamed from source4/scripting/bin/samr.py) | 2 | ||||
| -rwxr-xr-x | source4/scripting/python/examples/winreg.py (renamed from source4/scripting/bin/winreg.py) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump index d89667233f..c11f8dbd0d 100755 --- a/source4/scripting/bin/samba3dump +++ b/source4/scripting/bin/samba3dump @@ -14,7 +14,7 @@ sys.path.insert(0, "bin/python") import samba import samba.samba3 -parser = optparse.OptionParser("provision <libdir> [<smb.conf>]") +parser = optparse.OptionParser("samba3dump <libdir> [<smb.conf>]") parser.add_option("--format", type="choice", metavar="FORMAT", choices=["full", "summary"]) @@ -96,7 +96,7 @@ def print_samba3_secrets(secrets): def print_samba3_regdb(regdb): print_header("Registry") - from registry import str_regtype + from samba.registry import str_regtype for k in regdb.keys(): print "[%s]" % k diff --git a/source4/scripting/bin/samr.py b/source4/scripting/python/examples/samr.py index e91b5bc312..1f2afbe688 100755 --- a/source4/scripting/bin/samr.py +++ b/source4/scripting/python/examples/samr.py @@ -100,7 +100,7 @@ if len(sys.argv) != 2: binding = sys.argv[1] -print "Connecting to " + binding +print "Connecting to %s" % binding try: samr = samr.samr(binding) except Exception, e: diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/python/examples/winreg.py index 19d39e56ab..19d39e56ab 100755 --- a/source4/scripting/bin/winreg.py +++ b/source4/scripting/python/examples/winreg.py |