clang: ndb builds without plan9-extensions and with clang

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

sys/src/cmd/ndb/convDNS2M.c

@@ -276,7 +276,7 @@ convRR2M(RR *rp, uint8_t *p, uint8_t *ep, Dict *dp)
 			STRING(t->p);
 		break;
 	case Tnull:
-		BYTES(rp->null->data, rp->null->dlen);
+		BYTES(rp->null->Block.data, rp->null->Block.dlen);
 		break;
 	case Trp:
 		NAME(rp->rmb->name);
@@ -286,24 +286,24 @@ convRR2M(RR *rp, uint8_t *p, uint8_t *ep, Dict *dp)
 		USHORT(rp->key->flags);
 		UCHAR(rp->key->proto);
 		UCHAR(rp->key->alg);
-		BYTES(rp->key->data, rp->key->dlen);
+		BYTES(rp->key->Block.data, rp->key->Block.dlen);
 		break;
 	case Tsig:
-		USHORT(rp->sig->type);
-		UCHAR(rp->sig->alg);
+		USHORT(rp->sig->Cert.type);
+		UCHAR(rp->sig->Cert.alg);
 		UCHAR(rp->sig->labels);
 		ULONG(rp->sig->ttl);
 		ULONG(rp->sig->exp);
 		ULONG(rp->sig->incep);
-		USHORT(rp->sig->tag);
+		USHORT(rp->sig->Cert.tag);
 		NAME(rp->sig->signer->name);
-		BYTES(rp->sig->data, rp->sig->dlen);
+		BYTES(rp->sig->Cert.Block.data, rp->sig->Cert.Block.dlen);
 		break;
 	case Tcert:
 		USHORT(rp->cert->type);
 		USHORT(rp->cert->tag);
 		UCHAR(rp->cert->alg);
-		BYTES(rp->cert->data, rp->cert->dlen);
+		BYTES(rp->cert->Block.data, rp->cert->Block.dlen);
 		break;
 	}
 

sys/src/cmd/ndb/convM2DNS.c

@@ -460,7 +460,7 @@ retry:
 		}
 		break;
 	case Tnull:
-		BYTES(rp->null->data, rp->null->dlen);
+		BYTES(rp->null->Block.data, rp->null->Block.dlen);
 		break;
 	case Trp:
 		rp->rmb = dnlookup(NAME(dname), Cin, 1);
@@ -470,24 +470,24 @@ retry:
 		USHORT(rp->key->flags);
 		UCHAR(rp->key->proto);
 		UCHAR(rp->key->alg);
-		BYTES(rp->key->data, rp->key->dlen);
+		BYTES(rp->key->Block.data, rp->key->Block.dlen);
 		break;
 	case Tsig:
-		USHORT(rp->sig->type);
-		UCHAR(rp->sig->alg);
+		USHORT(rp->sig->Cert.type);
+		UCHAR(rp->sig->Cert.alg);
 		UCHAR(rp->sig->labels);
 		ULONG(rp->sig->ttl);
 		ULONG(rp->sig->exp);
 		ULONG(rp->sig->incep);
-		USHORT(rp->sig->tag);
+		USHORT(rp->sig->Cert.tag);
 		rp->sig->signer = dnlookup(NAME(dname), Cin, 1);
-		BYTES(rp->sig->data, rp->sig->dlen);
+		BYTES(rp->sig->Cert.Block.data, rp->sig->Cert.Block.dlen);
 		break;
 	case Tcert:
 		USHORT(rp->cert->type);
 		USHORT(rp->cert->tag);
 		UCHAR(rp->cert->alg);
-		BYTES(rp->cert->data, rp->cert->dlen);
+		BYTES(rp->cert->Block.data, rp->cert->Block.dlen);
 		break;
 	}
 	if(sp->p - data != len) {

sys/src/cmd/ndb/dblookup.c

@@ -47,16 +47,16 @@ static RR*	txtrr(Ndbtuple*, Ndbtuple*);
 
 static int	implemented[Tall] =
 {
-	[Ta]		1,
-	[Taaaa]		1,
-	[Tcname]	1,
-	[Tmx]		1,
-	[Tns]		1,
-	[Tnull]		1,
-	[Tptr]		1,
-	[Tsoa]		1,
-	[Tsrv]		1,
-	[Ttxt]		1,
+	[Ta]	=		1,
+	[Taaaa]	=		1,
+	[Tcname]	=	1,
+	[Tmx]	=		1,
+	[Tns]	=		1,
+	[Tnull]	=		1,
+	[Tptr]	=		1,
+	[Tsoa]	=		1,
+	[Tsrv]	=		1,
+	[Ttxt]	=		1,
 };
 
 /* straddle server configuration */
@@ -364,8 +364,8 @@ nullrr(Ndbtuple *entry, Ndbtuple *pair)
 
 	USED(entry);
 	rp = rralloc(Tnull);
-	rp->null->data = (uint8_t*)estrdup(pair->val);
-	rp->null->dlen = strlen((char*)rp->null->data);
+	rp->null->Block.data = (uint8_t*)estrdup(pair->val);
+	rp->null->Block.dlen = strlen((char*)rp->null->Block.data);
 	return rp;
 }
 /*

sys/src/cmd/ndb/dn.c

@@ -42,7 +42,7 @@ enum {
 DN *ht[HTLEN];
 
 static struct {
-	Lock;
+	Lock Lock;
 	uint32_t	names;		/* names allocated */
 	uint32_t	oldest;		/* longest we'll leave a name around */
 	int	active;
@@ -53,100 +53,100 @@ static struct {
 /* names of RR types */
 char *rrtname[] =
 {
-[Ta]		"ip",
-[Tns]		"ns",
-[Tmd]		"md",
-[Tmf]		"mf",
-[Tcname]	"cname",
-[Tsoa]		"soa",
-[Tmb]		"mb",
-[Tmg]		"mg",
-[Tmr]		"mr",
-[Tnull]		"null",
-[Twks]		"wks",
-[Tptr]		"ptr",
-[Thinfo]	"hinfo",
-[Tminfo]	"minfo",
-[Tmx]		"mx",
-[Ttxt]		"txt",
-[Trp]		"rp",
-[Tafsdb]	"afsdb",
-[Tx25]		"x.25",
-[Tisdn]		"isdn",
-[Trt]		"rt",
-[Tnsap]		"nsap",
-[Tnsapptr]	"nsap-ptr",
-[Tsig]		"sig",
-[Tkey]		"key",
-[Tpx]		"px",
-[Tgpos]		"gpos",
-[Taaaa]		"ipv6",
-[Tloc]		"loc",
-[Tnxt]		"nxt",
-[Teid]		"eid",
-[Tnimloc]	"nimrod",
-[Tsrv]		"srv",
-[Tatma]		"atma",
-[Tnaptr]	"naptr",
-[Tkx]		"kx",
-[Tcert]		"cert",
-[Ta6]		"a6",
-[Tdname]	"dname",
-[Tsink]		"sink",
-[Topt]		"opt",
-[Tapl]		"apl",
-[Tds]		"ds",
-[Tsshfp]	"sshfp",
-[Tipseckey]	"ipseckey",
-[Trrsig]	"rrsig",
-[Tnsec]		"nsec",
-[Tdnskey]	"dnskey",
-[Tspf]		"spf",
-[Tuinfo]	"uinfo",
-[Tuid]		"uid",
-[Tgid]		"gid",
-[Tunspec]	"unspec",
-[Ttkey]		"tkey",
-[Ttsig]		"tsig",
-[Tixfr]		"ixfr",
-[Taxfr]		"axfr",
-[Tmailb]	"mailb",
-[Tmaila]	"maila",
-[Tall]		"all",
+[Ta] =		"ip",
+[Tns] =		"ns",
+[Tmd] =		"md",
+[Tmf] =		"mf",
+[Tcname] =	"cname",
+[Tsoa] =		"soa",
+[Tmb] =		"mb",
+[Tmg] =		"mg",
+[Tmr] =		"mr",
+[Tnull] =		"null",
+[Twks] =		"wks",
+[Tptr] =		"ptr",
+[Thinfo] =	"hinfo",
+[Tminfo] =	"minfo",
+[Tmx] =		"mx",
+[Ttxt] =		"txt",
+[Trp] =		"rp",
+[Tafsdb] =	"afsdb",
+[Tx25] =		"x.25",
+[Tisdn] =		"isdn",
+[Trt] =		"rt",
+[Tnsap] =		"nsap",
+[Tnsapptr] =	"nsap-ptr",
+[Tsig] =		"sig",
+[Tkey] =		"key",
+[Tpx] =		"px",
+[Tgpos] =		"gpos",
+[Taaaa] =		"ipv6",
+[Tloc] =		"loc",
+[Tnxt] =		"nxt",
+[Teid] =		"eid",
+[Tnimloc] =	"nimrod",
+[Tsrv] =		"srv",
+[Tatma] =		"atma",
+[Tnaptr] =	"naptr",
+[Tkx] =		"kx",
+[Tcert] =		"cert",
+[Ta6] =		"a6",
+[Tdname] =	"dname",
+[Tsink] =		"sink",
+[Topt] =		"opt",
+[Tapl] =		"apl",
+[Tds] =		"ds",
+[Tsshfp] =	"sshfp",
+[Tipseckey] =	"ipseckey",
+[Trrsig] =	"rrsig",
+[Tnsec] =		"nsec",
+[Tdnskey] =	"dnskey",
+[Tspf] =		"spf",
+[Tuinfo] =	"uinfo",
+[Tuid] =		"uid",
+[Tgid] =		"gid",
+[Tunspec] =	"unspec",
+[Ttkey] =		"tkey",
+[Ttsig] =		"tsig",
+[Tixfr] =		"ixfr",
+[Taxfr] =		"axfr",
+[Tmailb] =	"mailb",
+[Tmaila] =	"maila",
+[Tall] =		"all",
 		0,
 };
 
 /* names of response codes */
 char *rname[Rmask+1] =
 {
-[Rok]			"ok",
-[Rformat]		"format error",
-[Rserver]		"server failure",
-[Rname]			"bad name",
-[Runimplimented]	"unimplemented",
-[Rrefused]		"we don't like you",
-[Ryxdomain]		"name should not exist",
-[Ryxrrset]		"rr set should not exist",
-[Rnxrrset]		"rr set should exist",
-[Rnotauth]		"not authorative",
-[Rnotzone]		"not in zone",
-[Rbadvers]		"bad opt version",
-/* [Rbadsig]		"bad signature", */
-[Rbadkey]		"bad key",
-[Rbadtime]		"bad signature time",
-[Rbadmode]		"bad mode",
-[Rbadname]		"duplicate key name",
-[Rbadalg]		"bad algorithm",
+[Rok] =			"ok",
+[Rformat] =		"format error",
+[Rserver] =		"server failure",
+[Rname] =			"bad name",
+[Runimplimented] =	"unimplemented",
+[Rrefused] =		"we don't like you",
+[Ryxdomain] =		"name should not exist",
+[Ryxrrset] =		"rr set should not exist",
+[Rnxrrset] =		"rr set should exist",
+[Rnotauth] =		"not authorative",
+[Rnotzone] =		"not in zone",
+[Rbadvers] =		"bad opt version",
+/* [Rbadsig] =		"bad signature", */
+[Rbadkey] =		"bad key",
+[Rbadtime] =		"bad signature time",
+[Rbadmode] =		"bad mode",
+[Rbadname] =		"duplicate key name",
+[Rbadalg] =		"bad algorithm",
 };
 unsigned nrname = nelem(rname);
 
 /* names of op codes */
 char *opname[] =
 {
-[Oquery]	"query",
-[Oinverse]	"inverse query (retired)",
-[Ostatus]	"status",
-[Oupdate]	"update",
+[Oquery] =	"query",
+[Oinverse] =	"inverse query (retired)",
+[Ostatus] =	"status",
+[Oupdate] =	"update",
 };
 
 uint32_t target = Deftarget;
@@ -269,7 +269,7 @@ dnstats(char *file)
 	if(fd < 0)
 		return;
 
-	qlock(&stats);
+	qlock(&stats.QLock);
 	fprint(fd, "# system %s\n", sysname());
 	fprint(fd, "# slave procs high-water mark\t%lud\n", stats.slavehiwat);
 	fprint(fd, "# queries received by 9p\t%lud\n", stats.qrecvd9p);
@@ -291,7 +291,7 @@ dnstats(char *file)
 		stats.negbdnoans);
 	fprint(fd, "# negative answers w no Rname set\t%lud\n", stats.negnorname);
 	fprint(fd, "# negative answers cached\t%lud\n", stats.negcached);
-	qunlock(&stats);
+	qunlock(&stats.QLock);
 
 	lock(&dnlock);
 	fprint(fd, "\n# domain names %lud target %lud\n", dnvars.names, target);
@@ -676,34 +676,32 @@ getactivity(Request *req, int recursive)
 
 	if(traceactivity)
 		dnslog("get: %d active by pid %d from %p",
-			dnvars.active, getpid(), getcallerpc(&req));
-	lock(&dnvars);
+			dnvars.active, getpid(), getcallerpc());
+	lock(&dnvars.Lock);
 	/*
 	 * can't block here if we're already holding one
 	 * of the dnvars.active (recursive).  will deadlock.
 	 */
 	while(!recursive && dnvars.mutex){
-		unlock(&dnvars);
+		unlock(&dnvars.Lock);
 		sleep(100);			/* tune; was 200 */
-		lock(&dnvars);
+		lock(&dnvars.Lock);
 	}
 	rv = ++dnvars.active;
 	now = time(nil);
 	nowns = nsec();
 	req->id = ++dnvars.id;
-	unlock(&dnvars);
+	unlock(&dnvars.Lock);
 
 	return rv;
 }
 void
 putactivity(int recursive)
 {
-	static uint32_t lastclean;
-
 	if(traceactivity)
 		dnslog("put: %d active by pid %d",
 			dnvars.active, getpid());
-	lock(&dnvars);
+	lock(&dnvars.Lock);
 	dnvars.active--;
 	assert(dnvars.active >= 0); /* "dnvars.active %d", dnvars.active */
 
@@ -714,18 +712,18 @@ putactivity(int recursive)
 	 */
 	if (recursive || dnvars.mutex ||
 	    (needrefresh == 0 && dnvars.active > 0)){
-		unlock(&dnvars);
+		unlock(&dnvars.Lock);
 		return;
 	}
 
 	/* wait till we're alone */
 	dnvars.mutex = 1;
 	while(dnvars.active > 0){
-		unlock(&dnvars);
+		unlock(&dnvars.Lock);
 		sleep(100);		/* tune; was 100 */
-		lock(&dnvars);
+		lock(&dnvars.Lock);
 	}
-	unlock(&dnvars);
+	unlock(&dnvars.Lock);
 
 	db2cache(needrefresh);
 
@@ -742,7 +740,6 @@ putactivity(int recursive)
 	dnageall(0);
 
 	/* let others back in */
-	lastclean = now;
 	needrefresh = 0;
 	dnvars.mutex = 0;
 }
@@ -951,32 +948,32 @@ rrcopy(RR *rp, RR **last)
 		*nrp = *rp;
 		nrp->key = key;
 		*key = *rp->key;
-		key->data = emalloc(key->dlen);
-		memmove(key->data, rp->key->data, rp->key->dlen);
+		key->Block.data = emalloc(key->Block.dlen);
+		memmove(key->Block.data, rp->key->Block.data, rp->key->Block.dlen);
 		break;
 	case Tsig:
 		sig = nrp->sig;
 		*nrp = *rp;
 		nrp->sig = sig;
 		*sig = *rp->sig;
-		sig->data = emalloc(sig->dlen);
-		memmove(sig->data, rp->sig->data, rp->sig->dlen);
+		sig->Cert.Block.data = emalloc(sig->Cert.Block.dlen);
+		memmove(sig->Cert.Block.data, rp->sig->Cert.Block.data, rp->sig->Cert.Block.dlen);
 		break;
 	case Tcert:
 		cert = nrp->cert;
 		*nrp = *rp;
 		nrp->cert = cert;
 		*cert = *rp->cert;
-		cert->data = emalloc(cert->dlen);
-		memmove(cert->data, rp->cert->data, rp->cert->dlen);
+		cert->Block.data = emalloc(cert->Block.dlen);
+		memmove(cert->Block.data, rp->cert->Block.data, rp->cert->Block.dlen);
 		break;
 	case Tnull:
 		null = nrp->null;
 		*nrp = *rp;
 		nrp->null = null;
 		*null = *rp->null;
-		null->data = emalloc(null->dlen);
-		memmove(null->data, rp->null->data, rp->null->dlen);
+		null->Block.data = emalloc(null->Block.dlen);
+		memmove(null->Block.data, rp->null->Block.data, rp->null->Block.dlen);
 		break;
 	default:
 		*nrp = *rp;
@@ -1289,8 +1286,8 @@ rrfmt(Fmt *f)
 		if (rp->null == nil)
 			fmtprint(&fstr, "\t<null>");
 		else
-			fmtprint(&fstr, "\t%.*H", rp->null->dlen,
-				rp->null->data);
+			fmtprint(&fstr, "\t%.*H", rp->null->Block.dlen,
+				rp->null->Block.data);
 		break;
 	case Ttxt:
 		fmtprint(&fstr, "\t");
@@ -1313,9 +1310,9 @@ rrfmt(Fmt *f)
 		   "\t<null> <null> <null> <null> <null> <null> <null> <null>");
 		else
 			fmtprint(&fstr, "\t%d %d %d %lud %lud %lud %d %s",
-				rp->sig->type, rp->sig->alg, rp->sig->labels,
+				rp->sig->Cert.type, rp->sig->Cert.alg, rp->sig->labels,
 				rp->sig->ttl, rp->sig->exp, rp->sig->incep,
-				rp->sig->tag, dnname(rp->sig->signer));
+				rp->sig->Cert.tag, dnname(rp->sig->signer));
 		break;
 	case Tcert:
 		if (rp->cert == nil)
@@ -1415,8 +1412,8 @@ rravfmt(Fmt *f)
 		if (rp->null == nil)
 			fmtprint(&fstr, " null=<null>");
 		else
-			fmtprint(&fstr, " null=%.*H", rp->null->dlen,
-				rp->null->data);
+			fmtprint(&fstr, " null=%.*H", rp->null->Block.dlen,
+				rp->null->Block.data);
 		break;
 	case Ttxt:
 		fmtprint(&fstr, " txt=");
@@ -1449,9 +1446,9 @@ rravfmt(Fmt *f)
 		else
 			fmtprint(&fstr,
 " type=%d alg=%d labels=%d ttl=%lud exp=%lud incep=%lud tag=%d signer=%s",
-				rp->sig->type, rp->sig->alg, rp->sig->labels,
+				rp->sig->Cert.type, rp->sig->Cert.alg, rp->sig->labels,
 				rp->sig->ttl, rp->sig->exp, rp->sig->incep,
-				rp->sig->tag, dnname(rp->sig->signer));
+				rp->sig->Cert.tag, dnname(rp->sig->signer));
 		break;
 	case Tcert:
 		if (rp->cert == nil)
@@ -2058,22 +2055,22 @@ rrfree(RR *rp)
 		free(rp->srv);
 		break;
 	case Tkey:
-		free(rp->key->data);
+		free(rp->key->Block.data);
 		memset(rp->key, 0, sizeof *rp->key);	/* cause trouble */
 		free(rp->key);
 		break;
 	case Tcert:
-		free(rp->cert->data);
+		free(rp->cert->Block.data);
 		memset(rp->cert, 0, sizeof *rp->cert);	/* cause trouble */
 		free(rp->cert);
 		break;
 	case Tsig:
-		free(rp->sig->data);
+		free(rp->sig->Cert.Block.data);
 		memset(rp->sig, 0, sizeof *rp->sig);	/* cause trouble */
 		free(rp->sig);
 		break;
 	case Tnull:
-		free(rp->null->data);
+		free(rp->null->Block.data);
 		memset(rp->null, 0, sizeof *rp->null);	/* cause trouble */
 		free(rp->null);
 		break;

sys/src/cmd/ndb/dnresolve.c

@@ -97,17 +97,17 @@ struct Query {
 
 /* estimated % probability of such a record existing at all */
 int likely[] = {
-	[Ta]		95,
-	[Taaaa]		10,
-	[Tcname]	15,
-	[Tmx]		60,
-	[Tns]		90,
-	[Tnull]		5,
-	[Tptr]		35,
-	[Tsoa]		90,
-	[Tsrv]		60,
-	[Ttxt]		15,
-	[Tall]		95,
+	[Ta] =		95,
+	[Taaaa] =		10,
+	[Tcname] =	15,
+	[Tmx] =		60,
+	[Tns] =		90,
+	[Tnull] =		5,
+	[Tptr] =		35,
+	[Tsoa] =		90,
+	[Tsrv] =		60,
+	[Ttxt] =		15,
+	[Tall] =		95,
 };
 
 static RR*	dnresolve1(char*, int, int, Request*, int, int);
@@ -310,7 +310,7 @@ destck(Dest *p)
 static void
 notestats(int64_t start, int tmout, int type)
 {
-	qlock(&stats);
+	qlock(&stats.QLock);
 	if (tmout) {
 		stats.tmout++;
 		if (type == Taaaa)
@@ -327,15 +327,15 @@ notestats(int64_t start, int tmout, int type)
 		else
 			stats.under10ths[wait10ths]++;
 	}
-	qunlock(&stats);
+	qunlock(&stats.QLock);
 }
 
 static void
 noteinmem(void)
 {
-	qlock(&stats);
+	qlock(&stats.QLock);
 	stats.answinmem++;
-	qunlock(&stats);
+	qunlock(&stats.QLock);
 }
 
 /* netquery with given name servers, free ns rrs when done */
@@ -1642,9 +1642,9 @@ netquery(Query *qp, int depth)
 		 * causing us to query other nameservers.
 		 */
 		qlp = &dp->querylck[qtype2lck(qp->type)];
-		qlock(qlp);
+		qlock(&qlp->QLock);
 		if (qlp->Ref.ref > Maxoutstanding) {
-			qunlock(qlp);
+			qunlock(&qlp->QLock);
 			if (!whined) {
 				whined = 1;
 				dnslog("too many outstanding queries for %s;"
@@ -1654,7 +1654,7 @@ netquery(Query *qp, int depth)
 			return 0;
 		}
 		++qlp->Ref.ref;
-		qunlock(qlp);
+		qunlock(&qlp->QLock);
 	}
 	procsetname("netquery: %s", dp->name);
 
@@ -1696,10 +1696,10 @@ netquery(Query *qp, int depth)
 //		askoutdns(dp, qp->type);
 
 	if(lock && qlp) {
-		qlock(qlp);
+		qlock(&qlp->QLock);
 		assert(qlp->Ref.ref > 0);
-		qunlock(qlp);
-		decref(qlp);
+		qunlock(&qlp->QLock);
+		decref(&qlp->Ref);
 	}
 	return rv;
 }

sys/src/cmd/ndb/dns.c

@@ -70,7 +70,7 @@ Lock	joblock;
 Job	*joblist;
 
 struct {
-	Lock;
+	Lock Lock;
 	Mfile	*inuse;		/* active mfile's */
 } mfalloc;
 
@@ -355,10 +355,10 @@ newfid(int fid, int needunused)
 {
 	Mfile *mf;
 
-	lock(&mfalloc);
+	lock(&mfalloc.Lock);
 	for(mf = mfalloc.inuse; mf != nil; mf = mf->next)
 		if(mf->fid == fid){
-			unlock(&mfalloc);
+			unlock(&mfalloc.Lock);
 			if(needunused)
 				return nil;
 			return mf;
@@ -368,7 +368,7 @@ newfid(int fid, int needunused)
 	mf->user = estrdup("dummy");
 	mf->next = mfalloc.inuse;
 	mfalloc.inuse = mf;
-	unlock(&mfalloc);
+	unlock(&mfalloc.Lock);
 	return mf;
 }
 
@@ -377,7 +377,7 @@ freefid(Mfile *mf)
 {
 	Mfile **l;
 
-	lock(&mfalloc);
+	lock(&mfalloc.Lock);
 	for(l = &mfalloc.inuse; *l != nil; l = &(*l)->next)
 		if(*l == mf){
 			*l = mf->next;
@@ -385,10 +385,10 @@ freefid(Mfile *mf)
 				free(mf->user);
 			memset(mf, 0, sizeof *mf);	/* cause trouble */
 			free(mf);
-			unlock(&mfalloc);
+			unlock(&mfalloc.Lock);
 			return;
 		}
-	unlock(&mfalloc);
+	unlock(&mfalloc.Lock);
 	sysfatal("freeing unused fid");
 }
 

sys/src/cmd/ndb/dns.h

@@ -206,9 +206,9 @@ struct Request
 typedef struct Querylck Querylck;
 struct Querylck
 {
-	QLock;
+	QLock QLock;
 //	Rendez;
-	Ref;
+	Ref Ref;
 };
 
 /*
@@ -246,18 +246,18 @@ struct Key
 	int	flags;
 	int	proto;
 	int	alg;
-	Block;
+	Block Block;
 };
 struct Cert
 {
 	int	type;
 	int	tag;
 	int	alg;
-	Block;
+	Block Block;
 };
 struct Sig
 {
-	Cert;
+	Cert Cert;
 	int	labels;
 	uint32_t	ttl;
 	uint32_t	exp;
@@ -266,7 +266,7 @@ struct Sig
 };
 struct Null
 {
-	Block;
+	Block Block;
 };
 
 /*
@@ -409,7 +409,7 @@ struct Cfg {
 
 /* (udp) query stats */
 typedef struct {
-	QLock;
+	QLock QLock;
 	uint32_t	slavehiwat;	/* procs */
 	uint32_t	qrecvd9p;	/* query counts */
 	uint32_t	qrecvdudp;

sys/src/cmd/ndb/dns.json

@@ -1,7 +1,6 @@
 {
 	"dns": {
 	"CFlags": [
-		"-fplan9-extensions"
 	],
 		"Include": [
 			"../cmd.json"

sys/src/cmd/ndb/dnsdebug.c

@@ -198,7 +198,7 @@ prettyrrfmt(Fmt *f)
 			rp->srv->pri, rp->srv->weight, rp->port, rp->host->name);
 		break;
 	case Tnull:
-		seprint(p, e, "\t%.*H", rp->null->dlen, rp->null->data);
+		seprint(p, e, "\t%.*H", rp->null->Block.dlen, rp->null->Block.data);
 		break;
 	case Ttxt:
 		p = seprint(p, e, "\t");
@@ -214,13 +214,13 @@ prettyrrfmt(Fmt *f)
 		break;
 	case Tsig:
 		seprint(p, e, "\t%d %d %d %lud %lud %lud %d %s",
-			rp->sig->type, rp->sig->alg, rp->sig->labels,
+			rp->sig->Cert.type, rp->sig->Cert.alg, rp->sig->labels,
 			rp->sig->ttl, rp->sig->exp, rp->sig->incep,
-			rp->sig->tag, rp->sig->signer->name);
+			rp->sig->Cert.tag, rp->sig->signer->name);
 		break;
 	case Tcert:
 		seprint(p, e, "\t%d %d %d",
-			rp->sig->type, rp->sig->tag, rp->sig->alg);
+			rp->sig->Cert.type, rp->sig->Cert.tag, rp->sig->Cert.alg);
 		break;
 	}
 out:

sys/src/cmd/ndb/dnsdebug.json

@@ -1,7 +1,6 @@
 {
 	"dnsdebug": {
 	"CFlags": [
-		"-fplan9-extensions"
 	],
 		"Include": [
 			"/sys/src/cmd/cmd.json"

sys/src/cmd/ndb/dnstcp.json

@@ -1,7 +1,6 @@
 {
 	"dnstcp": {
 	"CFlags": [
-		"-fplan9-extensions"
 	],
 		"Include": [
 			"/sys/src/cmd/cmd.json"