svn commit: samba r9830 - in branches/SAMBA_4_0: source/scripting/libjs testdata/samba3

[jelmer at samba.org]

Author: jelmer
Date: 2005-08-31 15:46:41 +0000 (Wed, 31 Aug 2005)
New Revision: 9830

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9830

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

Modified:
   branches/SAMBA_4_0/source/scripting/libjs/upgrade.js
   branches/SAMBA_4_0/testdata/samba3/registry.tdb


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/upgrade.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/upgrade.js	2005-08-31 15:17:34 UTC (rev 9829)
+++ branches/SAMBA_4_0/source/scripting/libjs/upgrade.js	2005-08-31 15:46:41 UTC (rev 9830)
@@ -30,7 +30,7 @@
  *   HKPT
  */
 
-function upgrade_registry(regdb,prefix)
+function upgrade_registry(regdb,prefix,ldb)
 {
 	assert(regdb != undefined);
 	var prefix_up = strupper(prefix);
@@ -63,7 +63,7 @@
 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 @@
 	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 @@
 		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]);

Modified: branches/SAMBA_4_0/testdata/samba3/registry.tdb
===================================================================
(Binary files differ)