Plan 9 from Bell Labs 2008-01-08

dist/replica/_plan9.db

@@ -9774,7 +9774,7 @@ sys/src/cmd/aux/antiword/xmalloc.c - 664 sys sys 1137261474 2501
 sys/src/cmd/aux/antiword/xml.c - 664 sys sys 1137261474 34115
 sys/src/cmd/aux/apm.c - 664 sys sys 1130423972 20275
 sys/src/cmd/aux/astarld.c - 664 sys sys 1015008684 4638
-sys/src/cmd/aux/cddb.c - 664 sys sys 1159664477 4676
+sys/src/cmd/aux/cddb.c - 664 sys sys 1199724334 4707
 sys/src/cmd/aux/clog.c - 664 sys sys 1014925109 1000
 sys/src/cmd/aux/consolefs.c - 664 sys sys 1150201588 21201
 sys/src/cmd/aux/conswdir.c - 664 sys sys 1168307860 2583
@@ -12817,7 +12817,7 @@ sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1194216290 11959
 sys/src/cmd/ndb/cs.c - 664 sys sys 1188515063 32892
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1194216346 25229
-sys/src/cmd/ndb/dn.c - 664 sys sys 1194996325 37423
+sys/src/cmd/ndb/dn.c - 664 sys sys 1199740043 37481
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1194996355 3265
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1194996432 35393
@@ -15856,3 +15856,7 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/aux/cddb - 775 sys sys 1199766029 72478
+386/bin/ndb/dns - 775 sys sys 1199766036 296379
+386/bin/ndb/dnsdebug - 775 sys sys 1199766042 270540
+386/bin/ndb/dnstcp - 775 sys sys 1199766049 268421

dist/replica/plan9.db

@@ -86,7 +86,7 @@
 386/bin/aux/antiword - 775 sys sys 1070288096 511478
 386/bin/aux/apm - 775 sys sys 1184731231 179071
 386/bin/aux/astarld - 775 sys sys 1168402277 64918
-386/bin/aux/cddb - 775 sys sys 1168402277 72541
+386/bin/aux/cddb - 775 sys sys 1199766029 72478
 386/bin/aux/clog - 775 sys sys 1178568252 65225
 386/bin/aux/consolefs - 775 sys sys 1184731231 154795
 386/bin/aux/conswdir - 775 sys sys 1062080411 38855
@@ -344,10 +344,10 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1188530160 148982
 386/bin/ndb/csquery - 775 sys sys 1176488418 61652
-386/bin/ndb/dns - 775 sys sys 1196742502 296310
-386/bin/ndb/dnsdebug - 775 sys sys 1196742508 270471
+386/bin/ndb/dns - 775 sys sys 1199766036 296379
+386/bin/ndb/dnsdebug - 775 sys sys 1199766042 270540
 386/bin/ndb/dnsquery - 775 sys sys 1185334136 64350
-386/bin/ndb/dnstcp - 775 sys sys 1196742512 268352
+386/bin/ndb/dnstcp - 775 sys sys 1199766049 268421
 386/bin/ndb/ipquery - 775 sys sys 1178568296 95524
 386/bin/ndb/mkdb - 775 sys sys 1168402340 64211
 386/bin/ndb/mkhash - 775 sys sys 1178568296 83312
@@ -9774,7 +9774,7 @@ sys/src/cmd/aux/antiword/xmalloc.c - 664 sys sys 1137261474 2501
 sys/src/cmd/aux/antiword/xml.c - 664 sys sys 1137261474 34115
 sys/src/cmd/aux/apm.c - 664 sys sys 1130423972 20275
 sys/src/cmd/aux/astarld.c - 664 sys sys 1015008684 4638
-sys/src/cmd/aux/cddb.c - 664 sys sys 1159664477 4676
+sys/src/cmd/aux/cddb.c - 664 sys sys 1199724334 4707
 sys/src/cmd/aux/clog.c - 664 sys sys 1014925109 1000
 sys/src/cmd/aux/consolefs.c - 664 sys sys 1150201588 21201
 sys/src/cmd/aux/conswdir.c - 664 sys sys 1168307860 2583
@@ -12817,7 +12817,7 @@ sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1194216290 11959
 sys/src/cmd/ndb/cs.c - 664 sys sys 1188515063 32892
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1194216346 25229
-sys/src/cmd/ndb/dn.c - 664 sys sys 1194996325 37423
+sys/src/cmd/ndb/dn.c - 664 sys sys 1199740043 37481
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1194996355 3265
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1194996432 35393

dist/replica/plan9.log

@@ -18230,3 +18230,10 @@
 1199487633 1 c sys/src/boot/pc/sdiahci.c - 664 sys sys 1199487196 27325
 1199491232 0 c sys/src/boot/pc/devsd.c - 664 sys sys 1199490748 11497
 1199493030 0 c sys/src/boot/pc/sdiahci.c - 664 sys sys 1199493064 27056
+1199725206 0 c sys/src/cmd/aux/cddb.c - 664 sys sys 1199724334 4707
+1199727004 0 c sys/src/cmd/aux/cddb.c - 664 sys sys 1199724334 4707
+1199741404 0 c sys/src/cmd/ndb/dn.c - 664 sys sys 1199740043 37481
+1199766605 0 c 386/bin/aux/cddb - 775 sys sys 1199766029 72478
+1199766605 1 c 386/bin/ndb/dns - 775 sys sys 1199766036 296379
+1199766605 2 c 386/bin/ndb/dnsdebug - 775 sys sys 1199766042 270540
+1199766605 3 c 386/bin/ndb/dnstcp - 775 sys sys 1199766049 268421

sys/src/cmd/aux/cddb.c

@@ -154,6 +154,7 @@ cddbfilltoc(Toc *t)
 		categ = f[1];
 		id = f[2];
 		break;
+	case 210:	/* exact matches */
 	case 211:	/* close matches */
 		if((p = Brdline(&bin, '\n')) == nil)
 			goto died;

sys/src/cmd/ndb/dn.c

@@ -801,7 +801,6 @@ rrcopy(RR *rp, RR **last)
 	RR *nrp;
 	SOA *soa;
 	Sig *sig;
-	Srv *srv;
 	Txt *t, *nt, **l;
 
 	nrp = rralloc(rp->type);
@@ -827,9 +826,8 @@ rrcopy(RR *rp, RR **last)
 		nrp->soa->slaves = copyserverlist(rp->soa->slaves);
 		break;
 	case Tsrv:
-		srv = nrp->srv;
 		*nrp = *rp;
-		nrp->srv = srv;
+		nrp->srv = emalloc(sizeof *nrp->srv);
 		*nrp->srv = *rp->srv;
 		break;
 	case Tkey:
@@ -1855,6 +1853,8 @@ rralloc(int type)
 	rp->magic = RRmagic;
 	rp->pc = getcallerpc(&type);
 	rp->type = type;
+	if (rp->type != type)
+		dnslog("rralloc: bogus type %d", type);
 	setmalloctag(rp, rp->pc);
 	switch(type){
 	case Tsoa: