Avoid PADDR(0).
 [jmk] --rw-rw-r-- M 330753 glenda sys 27806 Nov 27 00:07 sys/src/9/pc/sdmylex.c
	/n/sourcesdump/2005/1127/plan9/sys/src/9/pc/sdmylex.c:368,374 - 
	/n/sourcesdump/2005/1128/plan9/sys/src/9/pc/sdmylex.c:368,377
	  	ccb->datalen[0] = n>>16;
	  	ccb->datalen[1] = n>>8;
	  	ccb->datalen[2] = n;
	- 	p = PADDR(data);
	+ 	if(data == nil)
	+ 		p = 0;
	+ 	else
	+ 		p = PADDR(data);
	  	ccb->dataptr[0] = p>>16;
	  	ccb->dataptr[1] = p>>8;
	  	ccb->dataptr[2] = p;
	/n/sourcesdump/2005/1127/plan9/sys/src/9/pc/sdmylex.c:586,592 - 
	/n/sourcesdump/2005/1128/plan9/sys/src/9/pc/sdmylex.c:589,598
	  	ccb->datalen[1] = n>>8;
	  	ccb->datalen[2] = n>>16;
	  	ccb->datalen[3] = n>>24;
	- 	p = PADDR(r->data);
	+ 	if(r->data == nil)
	+ 		p = 0;
	+ 	else
	+ 		p = PADDR(r->data);
	  	ccb->dataptr[0] = p;
	  	ccb->dataptr[1] = p>>8;
	  	ccb->dataptr[2] = p>>16;

Add some definitions, sort others.
 [rsc] --rw-rw-r-- M 330753 glenda sys 5356 Nov 27 22:19 lib/ndb/common
	/n/sourcesdump/2005/1127/plan9/lib/ndb/common:136,141 - 
	/n/sourcesdump/2005/1128/plan9/lib/ndb/common:136,142
	  tcp=nntp port=119
	  tcp=netbios port=139
	  tcp=imap4 port=143
	+ tcp=imap port=143
	  tcp=NeWS port=144
	  tcp=print-srv port=170
	  tcp=z39.50 port=210
	/n/sourcesdump/2005/1127/plan9/lib/ndb/common:159,165 - 
	/n/sourcesdump/2005/1128/plan9/lib/ndb/common:160,165
	  tcp=whoami port=565
	  tcp=guard port=566
	  tcp=ticket port=567
	- tcp=dlsftp port=666
	  tcp=fmclient port=729
	  tcp=imaps port=993
	  tcp=pop3s port=995
	/n/sourcesdump/2005/1127/plan9/lib/ndb/common:168,173 - 
	/n/sourcesdump/2005/1128/plan9/lib/ndb/common:168,175
	  tcp=nfs port=2049
	  tcp=webster port=2627
	  tcp=weather port=3000
	+ tcp=sip port=5060
	+ tcp=sips port=5061
	  tcp=secstore port=5356
	  tcp=vnc-http port=5800
	  tcp=vnc port=5900
	/n/sourcesdump/2005/1127/plan9/lib/ndb/common:197,203 - 
	/n/sourcesdump/2005/1128/plan9/lib/ndb/common:199,204
	  tcp=glenglenda9 port=17028
	  tcp=glenglenda10 port=17029
	  tcp=flyboy port=17032
	- tcp=dlsftp port=17033
	  tcp=venti port=17034
	  tcp=wiki port=17035
	  tcp=vica port=17036
	/n/sourcesdump/2005/1127/plan9/lib/ndb/common:212,224 - 
	/n/sourcesdump/2005/1128/plan9/lib/ndb/common:213,228
	  udp=domain port=53
	  udp=dns port=53
	  udp=portmap port=111
	- udp=netbios-ns port=137
	  udp=ntp port=123
	+ udp=netbios-ns port=137
	  udp=snmp port=161
	  udp=rip port=520
	+ udp=dhcp6c port=546
	+ udp=dhcp6s port=547
	  udp=nfs port=2049
	  udp=bfs port=2201
	  udp=virgil port=2202
	+ udp=sip port=5060
	  udp=bandt2 port=7331
	  udp=oradius port=1645
	  udp=dhash port=11977

Use official port name: imap not imap4.
 [rsc] --rw-rw-r-- M 330753 glenda sys 16258 Nov 27 22:19 sys/src/cmd/upas/fs/imap4.c
	/n/sourcesdump/2005/1127/plan9/sys/src/cmd/upas/fs/imap4.c:431,437 - 
	/n/sourcesdump/2005/1128/plan9/sys/src/cmd/upas/fs/imap4.c:431,437
	  	if(imap->mustssl)
	  		port = "imaps";
	  	else
	- 		port = "imap4";
	+ 		port = "imap";
	  
	  	if((imap->fd = dial(netmkaddr(imap->host, "net", port), 0, 0, 0)) < 0)
	  		return geterrstr();