r9830: Fix support for importing registry values. Extended the examplre registry...

(This used to be commit 11e2a1938966f3aa9e9c25433181c20843951a6b)

diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 0b5a71e50c935682b2be6af9fab4895912d3c107..e78865f1965b7964af668fa95d6a631fd92d1685 100644 (file)
--- a/source4/scripting/libjs/upgrade.js
+++ b/source4/scripting/libjs/upgrade.js
@@ -30,7 +30,7 @@ function regkey_to_dn(name)
  *   HKPT
  */
 
-function upgrade_registry(regdb,prefix)
+function upgrade_registry(regdb,prefix,ldb)
 {
        assert(regdb != undefined);
        var prefix_up = strupper(prefix);
@@ -63,7 +63,7 @@ name: %s
 dn: %s,value=%s
 value: %s
 type: %d
-data:: %s", keydn, rv.value, rv.type, base64(rv.data));
+data:: %s", keydn, rv.name, rv.name, rv.type, ldb.encode(rv.data));
                }
        }
 
@@ -103,8 +103,6 @@ function upgrade_sam_account(acc,domaindn)
        var ldb = ldb_init();
        var ldif = sprintf(
 "dn: cn=%s,%s
-objectClass: top
-objectClass: person
 objectClass: user
 lastLogon: %d
 lastLogoff: %d
@@ -480,7 +478,7 @@ dn: @MAP=samba3sam
                var regdb = ldb_init();
                ok = regdb.connect(paths[hn]);
                assert(ok);
-               var ldif = upgrade_registry(samba3.registry, hn);
+               var ldif = upgrade_registry(samba3.registry, hn, regdb);
                for (var j in ldif) {
                        message("... ... " + j);
                        ok = regdb.add(ldif[j]);

diff --git a/testdata/samba3/registry.tdb b/testdata/samba3/registry.tdb
index 85045cacb9bb9e83b687f6e798d50f445cb48a15..9d64e02d8464f7fc62cc3af95798dd181709dcbe 100644 (file)
Binary files a/testdata/samba3/registry.tdb and b/testdata/samba3/registry.tdb differ