Browse Source

Plan 9 from Bell Labs 2004-01-20

David du Colombier 20 years ago
parent
commit
8f4fce8fb0

+ 4 - 4
dist/replica/plan9.db

@@ -389,7 +389,7 @@
 386/bin/sort - 775 sys sys 1064598313 81046
 386/bin/spin - 775 sys sys 1071245348 654328
 386/bin/split - 775 sys sys 1064598314 74007
-386/bin/srv - 775 sys sys 1071245348 80563
+386/bin/srv - 775 sys sys 1074492965 80673
 386/bin/srvfs - 775 sys sys 1069592375 39735
 386/bin/srvold9p - 775 sys sys 1064598316 130962
 386/bin/ssh - 775 sys sys 1071245349 210501
@@ -539,7 +539,7 @@
 386/lib/libmach.a - 664 sys sys 1073851272 746962
 386/lib/libmemdraw.a - 664 sys sys 1073851273 291288
 386/lib/libmemlayer.a - 664 sys sys 1073851273 47636
-386/lib/libmp.a - 664 sys sys 1074320139 81428
+386/lib/libmp.a - 664 sys sys 1074492965 77700
 386/lib/libndb.a - 664 sys sys 1073851273 54474
 386/lib/libplumb.a - 664 sys sys 1073851274 18876
 386/lib/libregexp.a - 664 sys sys 1073851274 37502
@@ -6916,10 +6916,10 @@ sys/src/cmd/auth/secstore/secacct.c - 644 sys sys 1015008431 755
 sys/src/cmd/auth/secstore/secchk.c - 664 sys sys 1055698993 560
 sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1062277640 12269
 sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1041890053 841
-sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1064789004 7955
+sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1074559798 7998
 sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1064667494 4971
 sys/src/cmd/auth/secstore/util.c - 664 sys sys 1021579985 1498
-sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1045504896 8973
+sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1074559811 8985
 sys/src/cmd/auth/status - 775 sys sys 1015008430 738
 sys/src/cmd/auth/uniq.c - 664 sys sys 1015008430 1429
 sys/src/cmd/auth/userpasswd.c - 664 sys sys 1015008432 591

+ 4 - 0
dist/replica/plan9.log

@@ -13413,3 +13413,7 @@
 1074321097 0 c 386/lib/libmp.a - 664 sys sys 1074320139 81428
 1074351701 0 c sys/src/9/pc/devarch.c - 664 sys sys 1074350950 18361
 1074454316 0 c sys/src/cmd/srv.c - 664 sys sys 1074452607 3885
+1074493922 0 c 386/bin/srv - 775 sys sys 1074492965 80673
+1074493922 1 c 386/lib/libmp.a - 664 sys sys 1074492965 77700
+1074560531 0 c sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1074559798 7998
+1074560531 1 c sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1074559811 8985

+ 5 - 4
sys/src/cmd/auth/secstore/secstored.c

@@ -7,7 +7,7 @@
 #include "SConn.h"
 #include "secstore.h"
 
-int secureidcheck(char *, char *);   // from /sys/src/cmd/auth/
+char* secureidcheck(char *, char *);   // from /sys/src/cmd/auth/
 extern char* dirls(char *path);
 
 int verbose;
@@ -222,7 +222,7 @@ static int
 dologin(int fd, char *S, int forceSTA)
 {
 	int i, n, rv;
-	char *file;
+	char *file, *mess;
 	char msg[Maxmsg+1];
 	PW *pw;
 	SConn *conn;
@@ -251,8 +251,9 @@ dologin(int fd, char *S, int forceSTA)
 			syslog(0, LOG, "no STA from %s", pw->id);
 			goto Out;
 		}
-		if(secureidcheck(pw->id, msg+3) <= 0){
-			syslog(0, LOG, "secureidcheck denied %s", pw->id);
+		mess = secureidcheck(pw->id, msg+3);
+		if(mess != nil){
+			syslog(0, LOG, "secureidcheck denied %s because %s", pw->id, mess);
 			goto Out;
 		}
 	}

+ 1 - 1
sys/src/cmd/auth/secureidcheck.c

@@ -326,7 +326,7 @@ getipv4addr(void)
 
 extern Ndb *db;
 
-/* returns 1 on success, 0 on failure */
+/* returns 0 on success, error message on failure */
 char*
 secureidcheck(char *user, char *response)
 {