From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 15:46:41 +0000 (+0000)
Subject: r9830: Fix support for importing registry values. Extended the examplre registry... 
X-Git-Tag: samba-misc-tags/initial-v4-0-unstable~7392
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=11e2a1938966f3aa9e9c25433181c20843951a6b;hp=96ccbd6402fa37338c49d9a55919a360e940bc48

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

diff --git a/source/scripting/libjs/upgrade.js b/source/scripting/libjs/upgrade.js
index 0b5a71e50c9..e78865f1965 100644
--- a/source/scripting/libjs/upgrade.js
+++ b/source/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 85045cacb9b..9d64e02d846 100644
Binary files a/testdata/samba3/registry.tdb and b/testdata/samba3/registry.tdb differ