Browse Source

Plan 9 from Bell Labs 2004-09-23

David du Colombier 19 years ago
parent
commit
ca02fcf4fa
5 changed files with 23 additions and 10 deletions
  1. 4 4
      dist/replica/_plan9.db
  2. 4 4
      dist/replica/plan9.db
  3. 4 0
      dist/replica/plan9.log
  4. 4 1
      sys/man/8/ipserv
  5. 7 1
      sys/src/cmd/ip/ftpd.c

+ 4 - 4
dist/replica/_plan9.db

@@ -279,7 +279,7 @@
 386/bin/ip/imap4d - 775 sys sys 1085077070 234217
 386/bin/ip/ipconfig - 775 sys sys 1089257533 135811
 386/bin/ip/ping - 775 sys sys 1089257533 75000
-386/bin/ip/ppp - 775 sys sys 1089257534 216401
+386/bin/ip/ppp - 775 sys sys 1095825517 216624
 386/bin/ip/pppoe - 775 sys sys 1089257534 75540
 386/bin/ip/pptp - 775 sys sys 1089257534 124731
 386/bin/ip/pptpd - 775 sys sys 1089257535 123832
@@ -5088,7 +5088,7 @@ sys/man/8/fsconfig - 664 sys sys 1045501600 8142
 sys/man/8/httpd - 664 sys sys 1065640802 6426
 sys/man/8/init - 664 sys sys 944959679 1430
 sys/man/8/ipconfig - 664 sys sys 1084462164 6171
-sys/man/8/ipserv - 664 sys sys 1063855796 4337
+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 1045501609 3740
 sys/man/8/lp - 664 sys sys 954614702 2491
@@ -9411,7 +9411,7 @@ sys/src/cmd/ip/dhcpd/ping.c - 664 sys sys 956275654 1881
 sys/src/cmd/ip/dhcpd/testlook.c - 664 sys sys 950389140 4640
 sys/src/cmd/ip/dhcpd/testlookup.c - 664 sys sys 950389140 3195
 sys/src/cmd/ip/dhcpd/testping.c - 664 sys sys 950389141 352
-sys/src/cmd/ip/ftpd.c - 664 sys sys 1046643070 32813
+sys/src/cmd/ip/ftpd.c - 664 sys sys 1095862384 32934
 sys/src/cmd/ip/ftpfs - 20000000775 sys sys 1014925642 0
 sys/src/cmd/ip/ftpfs/file.c - 664 sys sys 1014925642 4208
 sys/src/cmd/ip/ftpfs/ftpfs.c - 664 sys sys 1093452873 13584
@@ -12377,4 +12377,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 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/ip/ppp - 775 sys sys 1095822523 216624
+386/bin/ip/ftpd - 775 sys sys 1095910154 166038

+ 4 - 4
dist/replica/plan9.db

@@ -263,7 +263,7 @@
 386/bin/ip/dhcpclient - 775 sys sys 1089257531 92091
 386/bin/ip/dhcpd - 775 sys sys 1089257532 147194
 386/bin/ip/dhcpleases - 775 sys sys 1089257532 84202
-386/bin/ip/ftpd - 775 sys sys 1089257532 165934
+386/bin/ip/ftpd - 775 sys sys 1095910154 166038
 386/bin/ip/gizzard - 775 sys sys 1081480408 101521
 386/bin/ip/gping - 775 sys sys 1089257533 180180
 386/bin/ip/hogports - 775 sys sys 1085077067 42855
@@ -279,7 +279,7 @@
 386/bin/ip/imap4d - 775 sys sys 1085077070 234217
 386/bin/ip/ipconfig - 775 sys sys 1089257533 135811
 386/bin/ip/ping - 775 sys sys 1089257533 75000
-386/bin/ip/ppp - 775 sys sys 1095822523 216624
+386/bin/ip/ppp - 775 sys sys 1095825517 216624
 386/bin/ip/pppoe - 775 sys sys 1089257534 75540
 386/bin/ip/pptp - 775 sys sys 1089257534 124731
 386/bin/ip/pptpd - 775 sys sys 1089257535 123832
@@ -5088,7 +5088,7 @@ sys/man/8/fsconfig - 664 sys sys 1045501600 8142
 sys/man/8/httpd - 664 sys sys 1065640802 6426
 sys/man/8/init - 664 sys sys 944959679 1430
 sys/man/8/ipconfig - 664 sys sys 1084462164 6171
-sys/man/8/ipserv - 664 sys sys 1063855796 4337
+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 1045501609 3740
 sys/man/8/lp - 664 sys sys 954614702 2491
@@ -9411,7 +9411,7 @@ sys/src/cmd/ip/dhcpd/ping.c - 664 sys sys 956275654 1881
 sys/src/cmd/ip/dhcpd/testlook.c - 664 sys sys 950389140 4640
 sys/src/cmd/ip/dhcpd/testlookup.c - 664 sys sys 950389140 3195
 sys/src/cmd/ip/dhcpd/testping.c - 664 sys sys 950389141 352
-sys/src/cmd/ip/ftpd.c - 664 sys sys 1046643070 32813
+sys/src/cmd/ip/ftpd.c - 664 sys sys 1095862384 32934
 sys/src/cmd/ip/ftpfs - 20000000775 sys sys 1014925642 0
 sys/src/cmd/ip/ftpfs/file.c - 664 sys sys 1014925642 4208
 sys/src/cmd/ip/ftpfs/ftpfs.c - 664 sys sys 1093452873 13584

+ 4 - 0
dist/replica/plan9.log

@@ -16752,3 +16752,7 @@
 1095793295 37 a sys/src/games/sokoban/sokoban.c - 664 sys sys 1095792097 4760
 1095793295 38 a sys/src/games/sokoban/sokoban.h - 664 sys sys 1095792097 1197
 1095823901 0 c 386/bin/ip/ppp - 775 sys sys 1095822523 216624
+1095825701 0 c 386/bin/ip/ppp - 775 sys sys 1095825517 216624
+1095863509 0 c sys/man/8/ipserv - 664 sys sys 1095862383 4375
+1095863509 1 c sys/src/cmd/ip/ftpd.c - 664 sys sys 1095862384 32934
+1095910317 0 c 386/bin/ip/ftpd - 775 sys sys 1095910154 166038

+ 4 - 1
sys/man/8/ipserv

@@ -13,7 +13,7 @@ telnetd, rlogind, rexexec, ftpd \- Internet remote access daemons
 .B ip/rexexec
 .PP
 .B ip/ftpd
-.RB [ -adp ]
+.RB [ -eadp ]
 .RB [ -n
 .IR namepace-file ]
 .PP
@@ -156,6 +156,9 @@ the namespace for anonymous users (default
 .TP
 .B d
 write debugging output to standard error
+.TP
+.B e
+treat any user as anonymous
 .PP
 To preserve intended protections in shared file trees,
 any directory containing a file

+ 7 - 1
sys/src/cmd/ip/ftpd.c

@@ -127,7 +127,7 @@ int	structure;		/* file structure */
 char	data[64];		/* data address */
 int	pid;			/* transfer process */
 int	encryption;		/* encryption state */
-int	isnone, anon_ok, anon_only;
+int	isnone, anon_ok, anon_only, anon_everybody;
 char	cputype[Maxpath];	/* the environment variable of the same name */
 char	bindir[Maxpath];	/* bin directory for this architecture */
 char	mailaddr[Maxpath];
@@ -191,6 +191,10 @@ main(int argc, char **argv)
 		anon_ok = 1;
 		anon_only = 1;
 		break;
+	case 'e':
+		anon_ok = 1;
+		anon_everybody = 1;
+		break;
 	case 'n':
 		namespace = ARGF();
 		break;
@@ -520,6 +524,8 @@ usercmd(char *name)
 	user[sizeof(user)-1] = 0;
 	if(strcmp(user, "anonymous") == 0 || strcmp(user, "ftp") == 0)
 		strcpy(user, "none");
+	else if(anon_everybody)
+		strcpy(user,"none");
 	if(strcmp(user, "*none") == 0){
 		if(!anon_ok)
 			return reply("530 Not logged in: anonymous disallowed");