summaryrefslogtreecommitdiffstats
path: root/source4/scripting
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-31 15:46:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:36:16 -0500
commit2f23a8cec1537439fef3456389d55d95c5e78493 (patch)
tree311f53d5436fac603af83070e93d2c8c8f7b2483 /source4/scripting
parentf118373ea4707f0937b9abf83116bdc862594747 (diff)
downloadsamba-2f23a8cec1537439fef3456389d55d95c5e78493.tar.gz
samba-2f23a8cec1537439fef3456389d55d95c5e78493.tar.xz
samba-2f23a8cec1537439fef3456389d55d95c5e78493.zip
r9830: Fix support for importing registry values. Extended the examplre registry tdb.
(This used to be commit 11e2a1938966f3aa9e9c25433181c20843951a6b)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/libjs/upgrade.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/scripting/libjs/upgrade.js b/source4/scripting/libjs/upgrade.js
index 0b5a71e50c..e78865f196 100644
--- 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]);