r26607: Fix reading of values and subkeys in Samba 3 registry files.

[ira/wip.git] / source / scripting / bin / samba3dump

diff --git a/source/scripting/bin/samba3dump b/source/scripting/bin/samba3dump
index f8d10cbc7164b5c03171b8b3cd457e5233d44e4d..8f56d423d8cef16ef84a0af2ba75af9b249f638f 100755 (executable)
--- a/source/scripting/bin/samba3dump
+++ b/source/scripting/bin/samba3dump
@@ -80,7 +80,7 @@ def print_samba3_secrets(secrets):
     for domain in secrets.domains():
         print "\t--- %s ---" % domain
         print "\tSID: %s" % secrets.get_sid(domain)
     for domain in secrets.domains():
         print "\t--- %s ---" % domain
         print "\tSID: %s" % secrets.get_sid(domain)

-        print "\tGUID: %s" % secrets.get_dom_guid(domain)
+        print "\tGUID: %s" % secrets.get_domain_guid(domain)

         print "\tPlaintext pwd: %s" % secrets.get_machine_password(domain)
         if secrets.get_machine_last_change_time(domain):
             print "\tLast Changed: %lu" % secrets.get_machine_last_change_time(domain)
         print "\tPlaintext pwd: %s" % secrets.get_machine_password(domain)
         if secrets.get_machine_last_change_time(domain):
             print "\tLast Changed: %lu" % secrets.get_machine_last_change_time(domain)


@@ -93,11 +93,12 @@ def print_samba3_secrets(secrets):
 
 def print_samba3_regdb(regdb):
     print_header("Registry")
 
 def print_samba3_regdb(regdb):
     print_header("Registry")

+    from registry import str_regtype

 
     for k in regdb.keys():
 
     for k in regdb.keys():

-        print "%s" % k
-        for v in regdb.values(k):
-            print "\t%s: type %d, length %d" % (v.name, v.type, v.data.length)
+        print "[%s]" % k
+        for (value_name, (type, value))  in regdb.values(k).items():
+            print "\"%s\"=%s:%s" % (value_name, str_regtype(type), value)

 
 def print_samba3_winsdb(winsdb):
     print_header("WINS Database")
 
 def print_samba3_winsdb(winsdb):
     print_header("WINS Database")


@@ -151,7 +152,7 @@ def print_samba3_summary(samba3):
 
 libdir = args[0]
 if len(args) > 1:
 
 libdir = args[0]
 if len(args) > 1:

-    smbconf = args[2]
+    smbconf = args[1]

 else:
     smbconf = os.path.join(libdir, "smb.conf")
 
 else:
     smbconf = os.path.join(libdir, "smb.conf")