Plan 9 from Bell Labs 2006-03-19

dist/replica/_plan9.db

@@ -15,7 +15,7 @@
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1135570766 116009
-386/bin/8c - 775 sys sys 1141271048 362551
+386/bin/8c - 775 sys sys 1142740570 362700
 386/bin/8l - 775 sys sys 1140553397 115719
 386/bin/9660srv - 775 sys sys 1135570766 104023
 386/bin/aan - 775 sys sys 1138500151 131061
@@ -53,7 +53,7 @@
 386/bin/auth/debug - 775 sys sys 1140285590 101085
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1140717383 321439
+386/bin/auth/factotum - 775 sys sys 1142740571 321467
 386/bin/auth/fgui - 775 sys sys 1138500284 218624
 386/bin/auth/guard.srv - 775 sys sys 1135570774 142833
 386/bin/auth/iam - 775 sys sys 1085076981 50791
@@ -5213,7 +5213,7 @@ lib/tftpd - 20000000775 sys sys 944944178 0
 lib/unicode - 664 sys sys 958440028 223312
 lib/unicode.notice - 664 sys sys 958504386 1398
 lib/units - 664 sys sys 1071415518 9997
-lib/vgadb - 664 sys sys 1142618435 29319
+lib/vgadb - 664 sys sys 1142693929 29319
 lib/volcanoes - 664 sys sys 944944024 119831
 lib/words - 664 sys sys 1014923442 247097
 lp - 20000000775 sys sys 958199268 0
@@ -7719,7 +7719,7 @@ sys/man/8/mouse - 664 sys sys 971455511 2476
 sys/man/8/na - 664 sys sys 958527089 859
 sys/man/8/ndb - 664 sys sys 1118851681 9943
 sys/man/8/newuser - 664 sys sys 1116954242 2418
-sys/man/8/nfsserver - 664 sys sys 1128483119 3397
+sys/man/8/nfsserver - 664 sys sys 1142693998 3585
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/pem - 664 sys sys 1060263669 1189
 sys/man/8/ping - 664 sys sys 1139667147 3489
@@ -9469,7 +9469,7 @@ sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1107706104 3416
 sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1140272941 14955
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1140272942 18056
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1142728071 18491
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1032497638 2334
 sys/src/cmd/auth/iam.c - 664 sys sys 1015008430 841
@@ -9824,7 +9824,7 @@ sys/src/cmd/cc/com.c - 664 sys sys 1134321739 22202
 sys/src/cmd/cc/com64.c - 664 sys sys 1089299182 9975
 sys/src/cmd/cc/compat - 664 sys sys 1014925177 684
 sys/src/cmd/cc/compat.c - 664 sys sys 1132451523 454
-sys/src/cmd/cc/dcl.c - 664 sys sys 1141256563 26858
+sys/src/cmd/cc/dcl.c - 664 sys sys 1142726518 27014
 sys/src/cmd/cc/dpchk.c - 664 sys sys 1107365037 7152
 sys/src/cmd/cc/funct.c - 664 sys sys 984718510 6167
 sys/src/cmd/cc/lex.c - 664 sys sys 1141250058 23973
@@ -15614,3 +15614,4 @@ 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
+sys/src/9/bitsy/uartsa1110.c - 664 sys sys 1142741102 8537

dist/replica/plan9.db

@@ -15,7 +15,7 @@
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1135570766 116009
-386/bin/8c - 775 sys sys 1141271048 362551
+386/bin/8c - 775 sys sys 1142740570 362700
 386/bin/8l - 775 sys sys 1140553397 115719
 386/bin/9660srv - 775 sys sys 1135570766 104023
 386/bin/aan - 775 sys sys 1138500151 131061
@@ -53,7 +53,7 @@
 386/bin/auth/debug - 775 sys sys 1140285590 101085
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1140717383 321439
+386/bin/auth/factotum - 775 sys sys 1142740571 321467
 386/bin/auth/fgui - 775 sys sys 1138500284 218624
 386/bin/auth/guard.srv - 775 sys sys 1135570774 142833
 386/bin/auth/iam - 775 sys sys 1085076981 50791
@@ -5213,7 +5213,7 @@ lib/tftpd - 20000000775 sys sys 944944178 0
 lib/unicode - 664 sys sys 958440028 223312
 lib/unicode.notice - 664 sys sys 958504386 1398
 lib/units - 664 sys sys 1071415518 9997
-lib/vgadb - 664 sys sys 1142618435 29319
+lib/vgadb - 664 sys sys 1142693929 29319
 lib/volcanoes - 664 sys sys 944944024 119831
 lib/words - 664 sys sys 1014923442 247097
 lp - 20000000775 sys sys 958199268 0
@@ -7719,7 +7719,7 @@ sys/man/8/mouse - 664 sys sys 971455511 2476
 sys/man/8/na - 664 sys sys 958527089 859
 sys/man/8/ndb - 664 sys sys 1118851681 9943
 sys/man/8/newuser - 664 sys sys 1116954242 2418
-sys/man/8/nfsserver - 664 sys sys 1128483119 3397
+sys/man/8/nfsserver - 664 sys sys 1142693998 3585
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/pem - 664 sys sys 1060263669 1189
 sys/man/8/ping - 664 sys sys 1139667147 3489
@@ -7846,7 +7846,7 @@ sys/src/9/bitsy/sd.h - 664 sys sys 1037029038 0
 sys/src/9/bitsy/sdata.c - 664 sys sys 1131289776 44404
 sys/src/9/bitsy/tar.c - 664 sys sys 1017695521 1375
 sys/src/9/bitsy/trap.c - 664 sys sys 1105030166 19484
-sys/src/9/bitsy/uartsa1110.c - 664 sys sys 1037029045 8530
+sys/src/9/bitsy/uartsa1110.c - 664 sys sys 1142741102 8537
 sys/src/9/bitsy/wavelan.c - 664 sys sys 1116097770 27267
 sys/src/9/bitsy/wavelan.h - 664 sys sys 1037029076 27
 sys/src/9/boot - 20000000775 sys sys 1018556557 0
@@ -9469,7 +9469,7 @@ sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1107706104 3416
 sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1140272941 14955
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1140272942 18056
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1142728071 18491
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1032497638 2334
 sys/src/cmd/auth/iam.c - 664 sys sys 1015008430 841
@@ -9824,7 +9824,7 @@ sys/src/cmd/cc/com.c - 664 sys sys 1134321739 22202
 sys/src/cmd/cc/com64.c - 664 sys sys 1089299182 9975
 sys/src/cmd/cc/compat - 664 sys sys 1014925177 684
 sys/src/cmd/cc/compat.c - 664 sys sys 1132451523 454
-sys/src/cmd/cc/dcl.c - 664 sys sys 1141256563 26858
+sys/src/cmd/cc/dcl.c - 664 sys sys 1142726518 27014
 sys/src/cmd/cc/dpchk.c - 664 sys sys 1107365037 7152
 sys/src/cmd/cc/funct.c - 664 sys sys 984718510 6167
 sys/src/cmd/cc/lex.c - 664 sys sys 1141250058 23973

dist/replica/plan9.log

@@ -28042,3 +28042,10 @@
 1142343124 0 c sys/src/cmd/rdbfs.c - 664 sys sys 1142342219 7633
 1142359207 0 c 386/bin/rdbfs - 775 sys sys 1142358997 174432
 1142618500 0 c lib/vgadb - 664 sys sys 1142618435 29319
+1142694029 0 c lib/vgadb - 664 sys sys 1142693929 29319
+1142694029 1 c sys/man/8/nfsserver - 664 sys sys 1142693998 3585
+1142728240 0 c sys/src/cmd/auth/factotum/util.c - 664 sys sys 1142728071 18491
+1142728240 1 c sys/src/cmd/cc/dcl.c - 664 sys sys 1142726518 27014
+1142740844 0 c 386/bin/8c - 775 sys sys 1142740570 362700
+1142740844 1 c 386/bin/auth/factotum - 775 sys sys 1142740571 321467
+1142742645 0 c sys/src/9/bitsy/uartsa1110.c - 664 sys sys 1142741102 8537

lib/vgadb

@@ -783,7 +783,7 @@ pro400=1600x1200					# 76Hz, 90.0KHz
 	shb=1664 ehb=2088 ht=2144
 	shs=1648
 	vrs=1202 vre=1208 vt=1240
-nec5fg=1280x1024
+pro400=1280x1024
 	defaultclock=135				# 90hz, 103Khz
 	shb=1352 ehb=1544 ht=1712			# 
 	shs=1328

sys/man/8/nfsserver

@@ -78,7 +78,8 @@ Set up NFS service for the 9P server at
 .BR /srv ).
 .TP
 .B -n
-Do not allow per-user authentication.
+Do not allow per-user authentication
+(default and mandatory).
 .TP
 .BI -c " file"
 .I File
@@ -97,6 +98,13 @@ separated by white space: a regular expression (in the notation of
 for a class of servers, a regular expression for
 a class of clients, a file of user id's (in the format of a Unix
 password file), and a file of group id's (same format).
+.TP
+.B -s
+Expect a network connection on file descriptor 1
+instead of listening for incoming calls.
+.TP
+.B -t
+Listen for incoming TCP calls, rather than UDP calls.
 .PP
 NFS clients must be in the Plan 9
 .B /lib/ndb

sys/src/9/bitsy/uartsa1110.c

@@ -19,7 +19,7 @@ enum
 	Even=		1<<1,
 	Stop2=		1<<2,
 	Bits8=		1<<3,
-	SCE=			1<<4,	/* synchronous clock enable */
+	SCE=		1<<4,	/* synchronous clock enable */
 	RCE=		1<<5,	/* rx on falling edge of clock */
 	TCE=		1<<6,	/* tx on falling edge of clock */
 
@@ -27,13 +27,13 @@ enum
 	Rena=		1<<0,	/* receiver enable */
 	Tena=		1<<1,	/* transmitter enable */
 	Break=		1<<2,	/* force TXD3 low */
-	Rintena=		1<<3,	/* enable receive interrupt */
-	Tintena=		1<<4,	/* enable transmitter interrupt */
+	Rintena=	1<<3,	/* enable receive interrupt */
+	Tintena=	1<<4,	/* enable transmitter interrupt */
 	Loopback=	1<<5,	/* loop back data */
 
 	/* data bits */
-	DEparity=		1<<8,	/* parity error */
-	DEframe=		1<<9,	/* framing error */
+	DEparity=	1<<8,	/* parity error */
+	DEframe=	1<<9,	/* framing error */
 	DEoverrun=	1<<10,	/* overrun error */
 
 	/* status[0] bits */
@@ -42,40 +42,40 @@ enum
 	Rint1=		1<<2,	/* receiver fifo not empty and receiver idle */
 	Breakstart=	1<<3,
 	Breakend=	1<<4,
-	Fifoerror=		1<<5,	/* fifo error */
+	Fifoerror=	1<<5,	/* fifo error */
 
 	/* status[1] bits */
 	Tbusy=		1<<0,	/* transmitting */
 	Rnotempty=	1<<1,	/* receive fifo not empty */
-	Tnotfull=		1<<2,	/* transmit fifo not full */
+	Tnotfull=	1<<2,	/* transmit fifo not full */
 	ParityError=	1<<3,
 	FrameError=	1<<4,
-	Overrun=		1<<5,
+	Overrun=	1<<5,
 };
 
 extern PhysUart sa1110physuart;
 
 //static
 Uart sa1110uart[2] = {
-{	.regs		= UART3REGS,
-	.name	= "serialport3",
+{	.regs		= (void*)UART3REGS,
+	.name		= "serialport3",
 	.freq		= ClockFreq,
 	.bits		= 8,
 	.stop		= 1,
-	.parity	= 'n',
-	.baud	= 115200,
-	.phys	= &sa1110physuart,
+	.parity		= 'n',
+	.baud		= 115200,
+	.phys		= &sa1110physuart,
 	.special	= 0,
 	.next		= &sa1110uart[1], },
 
-{	.regs		= UART1REGS,
-	.name	= "serialport1",
+{	.regs		= (void*)UART1REGS,
+	.name		= "serialport1",
 	.freq		= ClockFreq,
 	.bits		= 8,
 	.stop		= 1,
-	.parity	= 'n',
-	.baud	= 115200,
-	.phys	= &sa1110physuart,
+	.parity		= 'n',
+	.baud		= 115200,
+	.phys		= &sa1110physuart,
 	.putc		= µcputc,
 	.special	= 0,
 	.next		= nil, },
@@ -408,18 +408,18 @@ sa1110_putc(Uart *uart, int c)
 PhysUart sa1110physuart = {
 	.name=		"sa1110",
 	.pnp= 		sa1110_pnp,
-	.enable=		sa1110_uartenable,
-	.disable=		sa1110_uartdisable,
+	.enable=	sa1110_uartenable,
+	.disable=	sa1110_uartdisable,
 	.bits=		sa1110_uartbits,
 	.kick=		sa1110_uartkick,
 	.modemctl=	sa1110_uartmodemctl,
 	.baud=		sa1110_uartbaud,
 	.stop=		sa1110_uartstop,
-	.parity=		sa1110_uartparity,
-	.dobreak=		sa1110_uartbreak,
-	.rts=			sa1110_uartrts,
-	.dtr=			sa1110_uartdtr,
-	.status=		sa1110_uartstatus,
+	.parity=	sa1110_uartparity,
+	.dobreak=	sa1110_uartbreak,
+	.rts=		sa1110_uartrts,
+	.dtr=		sa1110_uartdtr,
+	.status=	sa1110_uartstatus,
 	.power=		sa1110_uartpower,
 	.getc=		sa1110_getc,
 	.putc=		sa1110_putc,

sys/src/cmd/auth/factotum/util.c

@@ -25,12 +25,24 @@ bindnetcs(void)
 int
 _authdial(char *net, char *authdom)
 {
-	int fd;
+	int fd, vanilla;
 
-	if(bindnetcs() >= 0 && (fd=authdial(net, authdom)) >= 0)
-		return fd;
-	if(net != nil && strcmp(net, "/net") != 0)
-		return -1;
+	vanilla = net==nil || strcmp(net, "/net")==0;
+
+	if(!vanilla || bindnetcs()>=0)
+		return authdial(net, authdom);
+
+	/*
+	 * If we failed to mount /srv/cs, assume that
+	 * we're still bootstrapping the system and dial
+	 * the one auth server passed to us on the command line.
+	 * In normal operation, it is important *not* to do this,
+	 * because the bootstrap auth server is only good for
+	 * a single auth domain.
+	 *
+	 * The ticket request code should really check the
+	 * remote authentication domain too.
+	 */
 
 	/* use the auth sever passed to us as an arg */
 	if(authaddr == nil)
@@ -976,6 +988,8 @@ disablekey(Key *k)
 {
 	Attr *a;
 
+	if(sflag)	/* not on servers */
+		return;
 	for(a=k->attr; a; a=a->next){
 		if(a->type==AttrNameval && strcmp(a->name, "disabled") == 0)
 			return;

sys/src/cmd/cc/dcl.c

@@ -347,6 +347,10 @@ init1(Sym *s, Type *t, long o, int exflag)
 			return Z;
 
 		if(a->op == OCONST) {
+			if(vconst(a) && t->etype == TIND && a->type && a->type->etype != TIND){
+				diag(a, "initialize pointer to an integer: %s", s->name);
+				return Z;
+			}
 			if(!sametype(a->type, t)) {
 				/* hoop jumping to save malloc */
 				if(nodcast == Z)