Plan 9 from Bell Labs 2007-06-15

dist/replica/_plan9.db

@@ -108,7 +108,7 @@
 386/bin/aux/hardcopy - 775 sys sys 1020319063 1699
 386/bin/aux/isvmware - 775 sys sys 1032486791 23997
 386/bin/aux/lines - 775 sys sys 1168402281 60716
-386/bin/aux/listen - 775 sys sys 1179372073 107720
+386/bin/aux/listen - 775 sys sys 1181851031 107720
 386/bin/aux/listen1 - 775 sys sys 1179372074 94790
 386/bin/aux/lpdaemon - 775 sys sys 1173754553 170710
 386/bin/aux/lpdsend - 775 sys sys 1173754553 157339
@@ -239,7 +239,7 @@
 386/bin/fossil/conf - 775 sys sys 1085077052 1506
 386/bin/fossil/flchk - 775 sys sys 1180209225 237116
 386/bin/fossil/flfmt - 775 sys sys 1180209226 245137
-386/bin/fossil/fossil - 775 sys sys 1180209226 363773
+386/bin/fossil/fossil - 775 sys sys 1181851033 363780
 386/bin/fossil/last - 775 sys sys 1168402310 63550
 386/bin/freq - 775 sys sys 1168402310 62040
 386/bin/fs - 20000000775 sys sys 954380769 0
@@ -7699,7 +7699,7 @@ sys/man/4/rdbfs - 664 sys sys 944959699 1123
 sys/man/4/rio - 664 sys sys 1023206844 8660
 sys/man/4/sacfs - 664 sys sys 964886843 907
 sys/man/4/snap - 664 sys sys 1169092032 1908
-sys/man/4/srv - 664 sys sys 1179442921 4764
+sys/man/4/srv - 664 sys sys 1181849407 4970
 sys/man/4/tapefs - 664 sys sys 1140965924 1861
 sys/man/4/telco - 664 sys sys 1015024814 4359
 sys/man/4/u9fs - 664 sys sys 1043769139 4748
@@ -7796,7 +7796,7 @@ sys/man/8/init - 664 sys sys 944959679 1430
 sys/man/8/ipconfig - 664 sys sys 1177100280 7984
 sys/man/8/ipserv - 664 sys sys 1095862383 4375
 sys/man/8/kfscmd - 664 sys sys 1068569797 4515
-sys/man/8/listen - 664 sys sys 1174792129 3826
+sys/man/8/listen - 664 sys sys 1181790503 3658
 sys/man/8/lp - 664 sys sys 954614702 2491
 sys/man/8/mk9660 - 664 sys sys 1104430379 3946
 sys/man/8/mkfs - 664 sys sys 1163208436 3414
@@ -7939,7 +7939,7 @@ sys/src/9/bitsy/wavelan.h - 664 sys sys 1037029076 27
 sys/src/9/boot - 20000000775 sys sys 1161222920 0
 sys/src/9/boot/aux.c - 664 sys sys 1168305725 2586
 sys/src/9/boot/boot.c - 664 sys sys 1146746630 6013
-sys/src/9/boot/boot.h - 664 sys sys 1063857659 1785
+sys/src/9/boot/boot.h - 664 sys sys 1181823402 1722
 sys/src/9/boot/bootauth.c - 664 sys sys 1131289783 1160
 sys/src/9/boot/bootcache.c - 664 sys sys 1171955975 1608
 sys/src/9/boot/bootip.c - 664 sys sys 1072972133 3418
@@ -10327,7 +10327,7 @@ sys/src/cmd/fossil/9p.c - 664 sys sys 1140010159 22931
 sys/src/cmd/fossil/9ping.c - 664 sys sys 1042005503 1563
 sys/src/cmd/fossil/9proc.c - 664 sys sys 1138469518 15148
 sys/src/cmd/fossil/9srv.c - 664 sys sys 1138465941 3956
-sys/src/cmd/fossil/9user.c - 664 sys sys 1140110621 17266
+sys/src/cmd/fossil/9user.c - 664 sys sys 1181842829 17277
 sys/src/cmd/fossil/Ccli.c - 664 sys sys 1042005504 1624
 sys/src/cmd/fossil/Ccmd.c - 664 sys sys 1138465941 7985
 sys/src/cmd/fossil/Ccons.c - 664 sys sys 1055703737 6620
@@ -12813,7 +12813,7 @@ sys/src/cmd/mkmany - 664 sys sys 1123818681 1304
 sys/src/cmd/mkone - 664 sys sys 1123943673 910
 sys/src/cmd/mksyslib - 664 sys sys 1134390137 665
 sys/src/cmd/mntgen.c - 664 sys sys 1106410349 3630
-sys/src/cmd/mount.c - 664 sys sys 1138061862 1633
+sys/src/cmd/mount.c - 664 sys sys 1181847483 1685
 sys/src/cmd/ms2html.c - 664 sys sys 1166823350 41013
 sys/src/cmd/mtime.c - 664 sys sys 1036172302 450
 sys/src/cmd/mug.c - 664 sys sys 1157143847 24888
@@ -15844,4 +15844,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/man/8/listen - 664 sys sys 1181790503 3658
+386/bin/mount - 775 sys sys 1181877817 73380

dist/replica/plan9.db

@@ -108,7 +108,7 @@
 386/bin/aux/hardcopy - 775 sys sys 1020319063 1699
 386/bin/aux/isvmware - 775 sys sys 1032486791 23997
 386/bin/aux/lines - 775 sys sys 1168402281 60716
-386/bin/aux/listen - 775 sys sys 1179372073 107720
+386/bin/aux/listen - 775 sys sys 1181851031 107720
 386/bin/aux/listen1 - 775 sys sys 1179372074 94790
 386/bin/aux/lpdaemon - 775 sys sys 1173754553 170710
 386/bin/aux/lpdsend - 775 sys sys 1173754553 157339
@@ -239,7 +239,7 @@
 386/bin/fossil/conf - 775 sys sys 1085077052 1506
 386/bin/fossil/flchk - 775 sys sys 1180209225 237116
 386/bin/fossil/flfmt - 775 sys sys 1180209226 245137
-386/bin/fossil/fossil - 775 sys sys 1180209226 363773
+386/bin/fossil/fossil - 775 sys sys 1181851033 363780
 386/bin/fossil/last - 775 sys sys 1168402310 63550
 386/bin/freq - 775 sys sys 1168402310 62040
 386/bin/fs - 20000000775 sys sys 954380769 0
@@ -335,7 +335,7 @@
 386/bin/mkdir - 775 sys sys 1168402334 61205
 386/bin/mkpaqfs - 775 sys sys 1178568292 93268
 386/bin/mntgen - 775 sys sys 1179372098 144046
-386/bin/mount - 775 sys sys 1179372098 73326
+386/bin/mount - 775 sys sys 1181877817 73380
 386/bin/ms2html - 775 sys sys 1178568293 102703
 386/bin/mtime - 775 sys sys 1168402336 59376
 386/bin/mug - 775 sys sys 1179372099 176427
@@ -7699,7 +7699,7 @@ sys/man/4/rdbfs - 664 sys sys 944959699 1123
 sys/man/4/rio - 664 sys sys 1023206844 8660
 sys/man/4/sacfs - 664 sys sys 964886843 907
 sys/man/4/snap - 664 sys sys 1169092032 1908
-sys/man/4/srv - 664 sys sys 1179442921 4764
+sys/man/4/srv - 664 sys sys 1181849407 4970
 sys/man/4/tapefs - 664 sys sys 1140965924 1861
 sys/man/4/telco - 664 sys sys 1015024814 4359
 sys/man/4/u9fs - 664 sys sys 1043769139 4748
@@ -7939,7 +7939,7 @@ sys/src/9/bitsy/wavelan.h - 664 sys sys 1037029076 27
 sys/src/9/boot - 20000000775 sys sys 1161222920 0
 sys/src/9/boot/aux.c - 664 sys sys 1168305725 2586
 sys/src/9/boot/boot.c - 664 sys sys 1146746630 6013
-sys/src/9/boot/boot.h - 664 sys sys 1063857659 1785
+sys/src/9/boot/boot.h - 664 sys sys 1181823402 1722
 sys/src/9/boot/bootauth.c - 664 sys sys 1131289783 1160
 sys/src/9/boot/bootcache.c - 664 sys sys 1171955975 1608
 sys/src/9/boot/bootip.c - 664 sys sys 1072972133 3418
@@ -10327,7 +10327,7 @@ sys/src/cmd/fossil/9p.c - 664 sys sys 1140010159 22931
 sys/src/cmd/fossil/9ping.c - 664 sys sys 1042005503 1563
 sys/src/cmd/fossil/9proc.c - 664 sys sys 1138469518 15148
 sys/src/cmd/fossil/9srv.c - 664 sys sys 1138465941 3956
-sys/src/cmd/fossil/9user.c - 664 sys sys 1140110621 17266
+sys/src/cmd/fossil/9user.c - 664 sys sys 1181842829 17277
 sys/src/cmd/fossil/Ccli.c - 664 sys sys 1042005504 1624
 sys/src/cmd/fossil/Ccmd.c - 664 sys sys 1138465941 7985
 sys/src/cmd/fossil/Ccons.c - 664 sys sys 1055703737 6620
@@ -12813,7 +12813,7 @@ sys/src/cmd/mkmany - 664 sys sys 1123818681 1304
 sys/src/cmd/mkone - 664 sys sys 1123943673 910
 sys/src/cmd/mksyslib - 664 sys sys 1134390137 665
 sys/src/cmd/mntgen.c - 664 sys sys 1106410349 3630
-sys/src/cmd/mount.c - 664 sys sys 1138061862 1633
+sys/src/cmd/mount.c - 664 sys sys 1181847483 1685
 sys/src/cmd/ms2html.c - 664 sys sys 1166823350 41013
 sys/src/cmd/mtime.c - 664 sys sys 1036172302 450
 sys/src/cmd/mug.c - 664 sys sys 1157143847 24888

dist/replica/plan9.log

@@ -49250,3 +49250,10 @@
 1181764823 0 c 386/bin/paqfs - 775 sys sys 1181764592 108714
 1181790023 0 c sys/src/cmd/aux/listen.c - 664 sys sys 1181789265 9292
 1181791823 0 c sys/man/8/listen - 664 sys sys 1181790503 3658
+1181824221 0 c sys/src/9/boot/boot.h - 664 sys sys 1181823402 1722
+1181844023 0 c sys/src/cmd/fossil/9user.c - 664 sys sys 1181842829 17277
+1181847622 0 c sys/src/cmd/mount.c - 664 sys sys 1181847483 1685
+1181849423 0 c sys/man/4/srv - 664 sys sys 1181849407 4970
+1181851223 0 c 386/bin/aux/listen - 775 sys sys 1181851031 107720
+1181851223 1 c 386/bin/fossil/fossil - 775 sys sys 1181851033 363780
+1181878222 0 c 386/bin/mount - 775 sys sys 1181877817 73380

sys/man/4/srv

@@ -4,9 +4,8 @@ srv, srvold9p, 9fs, srvssh \- start network file service
 .SH SYNOPSIS
 .B srv
 [
-.B -abceCmnq
-]
-[
+.B -abcCemnq
+] [
 .B -s
 .I seconds
 ]
@@ -43,18 +42,23 @@ srv, srvold9p, 9fs, srvssh \- start network file service
 .RI [ net !] system
 .RI [ mountpoint ]
 .PP
+.in +0.5i
+.ti -0.5i
 .B srvold9p
 [
-.B -abcCd
+.B -abcCdF
 ] [
-.B -u
-.I user
+.B -p
+.I servicename
 ] [
 .B -s
-| [
+|
 .B -m
 .I mountpoint
-] ] [
+] [
+.B -u
+.I user
+] [
 .B -x
 .I command
 |
@@ -63,16 +67,17 @@ srv, srvold9p, 9fs, srvssh \- start network file service
 |
 .B -f
 .I file
-] [
-.B -F
-] [
-.B -p
-.I servicename
 ]
+.br
+.in -0.5i
 .SH DESCRIPTION
 .I Srv
 dials the given machine and initializes the connection to serve the
 9P protocol.
+By default, it connects to the
+.L 9fs
+(9P)
+service, which for TCP is port 564.
 It then creates in
 .B /srv
 a file named
@@ -110,13 +115,13 @@ The
 .BR C ,
 and
 .B n
-flags are used to control the mount flag as in
+options are used to control the mount flags as in
 .I mount
 (see
 .IR bind (1)).
 The
 .B e
-flag causes
+option causes
 .I srv
 to treat
 .I system
@@ -124,7 +129,7 @@ as a shell command to be executed rather than
 an address to be dialed.
 The
 .B s
-flag causes
+option causes
 .I srv
 to sleep for the specified number of seconds
 after establishing the connection
@@ -137,7 +142,7 @@ The specified
 must serve 9P.  Usually
 .I service
 can be omitted; when calling some
-non-Plan 9 systems, a
+non-Plan-9 systems, a
 .I service
 such as
 .B u9fs
@@ -212,11 +217,21 @@ that performs a version translation on the 9P messages on the underlying connect
 Some of its options are the same as those of
 .IR srv ;
 the special ones are:
-.TF "-u userxx"
+.TF "-x commandxx"
 .PD
 .TP
 .B -d
-Enable debugging
+Enable debugging.
+.TP
+.B -F
+Insert a special (internal) filter process to the connection to maintain
+message boundaries; usually only needed on TCP connections.
+.TP
+.BI -p\  servicename
+Post the service under
+.IR srv (3)
+as
+.BI /srv/ servicename\f1.
 .TP
 .BI -u\  user
 When connecting to the remote server, log in as
@@ -248,16 +263,6 @@ Use
 (typically an existing
 .IR srv (3)
 file) as the connection.
-.TP
-.B -F
-Insert a special (internal) filter process to the connection to maintain
-message boundaries; usually only needed on TCP connections.
-.TP
-.BI -p\  servicename
-Post the service under
-.IR srv (3)
-as
-.BI /srv/ servicename\f1.
 .PP
 .I Srvold9p
 is run automatically when a
@@ -296,8 +301,6 @@ started via
 .EX
 srvssh unix
 .EE
-.SH NOTE
-The TCP port used for 9P is 564.
 .SH FILES
 .TF /srv/*
 .TP
@@ -316,9 +319,20 @@ and
 .B /sys/src/cmd/srvold9p
 .SH "SEE ALSO"
 .IR bind (1),
+.IR auth (2),
 .IR dial (2),
 .IR srv (3),
 .IR exportfs (4),
 .IR import (4),
 .IR ftpfs (4),
 .IR u9fs (4)
+.SH BUGS
+.I Srv
+does not explicitly report failures of
+.I auth_proxy
+(see
+.IR auth (2));
+.I mount
+(see
+.IR bind (1))
+does.

sys/src/9/boot/boot.h

@@ -24,7 +24,6 @@ extern Method	method[];
 extern void	(*pword)(int, Method*);
 extern char	sys[];
 extern uchar	hostkey[];
-extern char	username[];
 extern uchar	statbuf[Statsz];
 extern int	bargc;
 extern char	*bargv[Nbarg];
@@ -43,7 +42,6 @@ extern int	sendmsg(int, char*);
 extern void	setenv(char*, char*);
 extern void	settime(int, int, char*);
 extern void	srvcreate(char*, int);
-extern void	setusername(int, Method*);
 extern void	warning(char*);
 extern int	writefile(char*, char*, int);
 extern void	boot(int, char **);

sys/src/cmd/fossil/9user.c

@@ -221,13 +221,10 @@ _groupRemMember(Ubox* box, User* g, char* member)
 		g->group = nil;
 		break;
 	default:
-		while(i < g->ngroup){
+		for(; i < g->ngroup; i++)
 			g->group[i] = g->group[i+1];
-			i++;
-		}
-		/*FALLTHROUGH*/
-	case 1:
-		g->group = vtMemRealloc(g->group, (g->ngroup)*sizeof(char*));
+		g->group[i] = nil;		/* prevent accidents */
+		g->group = vtMemRealloc(g->group, g->ngroup * sizeof(char*));
 		break;
 	}
 

sys/src/cmd/mount.c

@@ -17,6 +17,8 @@ amount0(int fd, char *mntpt, int flags, char *aname, char *keyspec)
 		ai = auth_proxy(afd, amount_getkey, "proto=p9any role=client %s", keyspec);
 		if(ai != nil)
 			auth_freeAI(ai);
+		else
+			fprint(2, "%s: auth_proxy: %r\n", argv0);
 	}
 	rv = mount(fd, afd, mntpt, flags, aname);
 	if(afd >= 0)