From 11e2a1938966f3aa9e9c25433181c20843951a6b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Aug 2005 15:46:41 +0000
Subject: [PATCH] r9830: Fix support for importing registry values. Extended
 the examplre registry tdb.

---
 source/scripting/libjs/upgrade.js |   8 +++-----
 testdata/samba3/registry.tdb      | Bin 8192 -> 8192 bytes
 2 files changed, 3 insertions(+), 5 deletions(-)

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 85045cacb9bb9e83b687f6e798d50f445cb48a15..9d64e02d8464f7fc62cc3af95798dd181709dcbe 100644
GIT binary patch
literal 8192
zcmeHLTWl0n7(OVMBB)h?0HRqH5K7H7ib?U7?qy0h?9NPPrWaxpyR=if$#$pCPC@iR
zqnKdgh4`ci0Ujjr!T2DNpy`VyMnjB=h6glaATfj&pCr)-gMQzcnceNuE!&d#G$;8w
zdv4$P&-ef5KPR;_sl<4(<lG_VE|VLUY<*+yuK%_5gS(qAH?}<J>t5D;%*@K>eeAh<
zn-DMEdE=O?D`vM{4cD68D#W$6#+F;FUs~0C{>jizA5I&t+t=H$b@N@#=XHV8m}8G0
zHL?Bg2Cnv{0e4%2221DQjI7v(z9aMOB^t+X;`X3+w9b#;g}-yF>qiQ47Gu|=iQQbj
z<IJ!Bj9<C_bKjm^UMxX_rT5x{NmCW6R2Ql&34mK7zIk))mJboz9IsTza$>$X>bVtn
z+!x)bv2+4liy?So==8rg%v18&w5gLtE<IQ*kGTgc3C$KFgE=hE0FMCo0e?(?UYLhN
z8O&-KebC~38kC;)Jg4jrI9{dbmeBxOS$gpIae!y{w;$g6G1`B1KQ+7RIF)q2X{wq%
zpqf@z*W?n0S1kKt2s|t~fP1H|M>jq2T5Gm8@G6Fx4L2a!VZFFth%s=oaE&Cuka}_5
z&WpFOMz9ig11bS`r?^Hp&O#r))TbR-ygo<_BGAWhJ->nlM$p3215hXK;ryp#=N7pK
z-LwPKBmEQLV_dHR7}pW6pefZ@wf0)Jn&*CL1Ispm$7CI_>fVjNMDvtzXk9R+-Lmhw
zCCl+Kwg>RBi44A5feozBoH*7nKXPzd*KAYIS*opsKc!)zMxHx1J?iUIK4P_k`~)tR
z67VEItv)-~+21lZysKyW)3$Edh}J+Td1mGIo7)t|AC?n`fidI@>hvJ67U=lo*r}V^
zAomqYB`n7~P#kp-00!otg)exf9|i6K-r144R6BpoY_n8zAe&Y#dFXP5@?@b*TF0xN
zY5HI%AXDb{Ejw>&qY`l{xulj)YOJcJT)>(rc(AwX19CqN&<B66S$1ZT+=|tQyc&2S
zMgLv^A<r7M*a$383r6)UEz|=@cO`c}V|xUhEc6}oIBoyw+Y4<Auw5NMw#(_eF%u_Q
z{tdp&4eJ5sh8kaZZ?u#<d12M(2E*~jOT~RKd?H+jx;zE60UhnnFE&T0W^XQ=l3wlV
z+6Ar=fQ9_e0o3Js--^LS?L#pFekI^$5*+~_OApWq@Gf}$%e~iX{LNxK%n5b*Kkt@{
zzKi@1e-43%r3Z-e!7F{kuP%^R$?ICy)@wPRycvkhdxdeB02UaBbmrV~Xpc^1r-Zy$
zHsP}E!NA7=z6bVbUwn0Q+pA~PP8(T6y3r_jg-OTfwOFr7H#q6bm0w@lu~1&cNSevK
zYDZUL#LM>rHQ5eOlh%2qDf4NfIXtL%l`y}vWB{I1YV-1ji=C~nrD!ToY4jqg$unpE
zdhg-W%NN1jD3Q!xFjd~0)SXy%=G0#ScR#ztX5i!1!8?NYGRJguTn^tXX%kiX?${=O
zG>p4)Sp-~0X8v)z{BRuIHH(khs=z~l=d{1eaaJ;)O1@yKy9bgvW!59MmBghO^3kyb
zgjQj4Um+1b(Gq;($na!RrV)qbSBM#WHDChR{(gtdm$zyIABeTb8;!|0<Av#xZ%w&w
zDO2>EQKXGS(w<)Qrjbd9#h@sPGTxD{I4CNpTjCJDzHr2(cmnS|woIYdMNAGO-+OXA
z`#p@~p3dVh%MsvNfZFEUj{n|7*Jg>XdZ?=x3`NTnD^sPyAq|IH8oov@Z~)7fVPpac
z$`$+B=6S9cy)76~1T_%iB=9}*jM2_ot?+$;6dIRUfmnf9fmnf9fmnf9fmnf9fmnf9
Ufmnf9fmnf9ftD4R!2cKi11+CFI{*Lx

delta 249
zcmZp0XmFUYf~kgeqM;Pi1?Gu{SxhQGGL1=tWujsEL<eP|5@rSzU;tJc0wj%mcQ7HO
zo<P|ZEC?|eO9aSZ1!8U>*4lRG&rC^1H4kqeUj{~?KyYMmh^sGy&g7%4wj54Q4nQFW
zhRLtk{D1~d=3)zFa*CN;$R#|vgw0XJ$;l}KEYHAT0i@M|n0NA9ZX-UBL4K(vIr-`N
rc?<!QJ$a%SohC2gX<@p;GFgjPiz!EH^F01Ifz1c_Ww=;cq!<_gZ7MGW

-- 
2.34.1