diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 08:11:05 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 08:11:05 +1000 |
| commit | 51ae2302a68033b1b79a4ebc8d4cbab64adcf843 (patch) | |
| tree | d8b1af54efe4ec70607ef2bcbd873c2cd667d894 /source4/scripting/bin/samba3dump | |
| parent | 5d0d239d1ab826c91839a603f93d2c0061658888 (diff) | |
| parent | 52b230141b5ad9f317f97e7d257703614bab3985 (diff) | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
It seems the format of main.mk changed in my sleep...
Conflicts:
source/main.mk
(This used to be commit 56f2288e4f4f1aa70d11fc5f118458baf5803627)
Diffstat (limited to 'source4/scripting/bin/samba3dump')
| -rwxr-xr-x | source4/scripting/bin/samba3dump | 4 |
1 files changed, 2 insertions, 2 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 |