Plan 9 from Bell Labs 2004-08-15

dist/replica/_plan9.db

@@ -10364,10 +10364,10 @@ sys/src/cmd/ssh/cipherrc4.c - 664 sys sys 1016466379 674
 sys/src/cmd/ssh/ciphertwiddle.c - 664 sys sys 1016466379 380
 sys/src/cmd/ssh/cmsg.c - 664 sys sys 1071095546 8351
 sys/src/cmd/ssh/mkfile - 664 sys sys 1048179592 1045
-sys/src/cmd/ssh/msg.c - 664 sys sys 1062091016 8023
+sys/src/cmd/ssh/msg.c - 664 sys sys 1092516579 8102
 sys/src/cmd/ssh/pubkey.c - 664 sys sys 1019928902 3974
 sys/src/cmd/ssh/scp.c - 664 sys sys 1075130172 13886
-sys/src/cmd/ssh/smsg.c - 664 sys sys 1062091015 6135
+sys/src/cmd/ssh/smsg.c - 664 sys sys 1092516575 6374
 sys/src/cmd/ssh/ssh.c - 664 sys sys 1066515693 9667
 sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086
 sys/src/cmd/ssh/sshnet.c - 664 sys sys 1078840016 17641
@@ -12337,3 +12337,7 @@ 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/scp - 775 sys sys 1092539157 149860
+386/bin/ssh - 775 sys sys 1092539158 208978
+386/bin/aux/sshserve - 775 sys sys 1092539157 249442
+386/bin/sshnet - 775 sys sys 1092539158 280678

dist/replica/plan9.db

@@ -136,7 +136,7 @@
 386/bin/aux/searchfs - 775 sys sys 1085077005 87587
 386/bin/aux/sprog - 775 sys sys 1085077006 77357
 386/bin/aux/ssh_genkey - 775 sys sys 1045537957 194629
-386/bin/aux/sshserve - 775 sys sys 1085077007 251118
+386/bin/aux/sshserve - 775 sys sys 1092539157 249442
 386/bin/aux/stub - 775 sys sys 1089397310 132953
 386/bin/aux/tcpostio - 775 sys sys 1089985359 200148
 386/bin/aux/text2post - 775 sys sys 1085077008 76406
@@ -370,7 +370,7 @@
 386/bin/rx - 775 sys sys 1085077094 79893
 386/bin/sam - 775 sys sys 1085077095 155916
 386/bin/scat - 775 sys sys 1085077095 281706
-386/bin/scp - 775 sys sys 1085077096 151403
+386/bin/scp - 775 sys sys 1092539157 149860
 386/bin/scuzz - 775 sys sys 1085077096 109619
 386/bin/sed - 775 sys sys 1085077096 87471
 386/bin/seq - 775 sys sys 1085077096 38178
@@ -387,8 +387,8 @@
 386/bin/srv - 775 sys sys 1085077099 80398
 386/bin/srvfs - 775 sys sys 1085077099 39578
 386/bin/srvold9p - 775 sys sys 1085077100 128139
-386/bin/ssh - 775 sys sys 1085077100 210573
-386/bin/sshnet - 775 sys sys 1089397318 280607
+386/bin/ssh - 775 sys sys 1092539158 208978
+386/bin/sshnet - 775 sys sys 1092539158 280678
 386/bin/stats - 775 sys sys 1087442538 188279
 386/bin/strings - 775 sys sys 1085077101 60090
 386/bin/strip - 775 sys sys 1085077101 59994
@@ -10364,10 +10364,10 @@ sys/src/cmd/ssh/cipherrc4.c - 664 sys sys 1016466379 674
 sys/src/cmd/ssh/ciphertwiddle.c - 664 sys sys 1016466379 380
 sys/src/cmd/ssh/cmsg.c - 664 sys sys 1071095546 8351
 sys/src/cmd/ssh/mkfile - 664 sys sys 1048179592 1045
-sys/src/cmd/ssh/msg.c - 664 sys sys 1062091016 8023
+sys/src/cmd/ssh/msg.c - 664 sys sys 1092516579 8102
 sys/src/cmd/ssh/pubkey.c - 664 sys sys 1019928902 3974
 sys/src/cmd/ssh/scp.c - 664 sys sys 1075130172 13886
-sys/src/cmd/ssh/smsg.c - 664 sys sys 1062091015 6135
+sys/src/cmd/ssh/smsg.c - 664 sys sys 1092516575 6374
 sys/src/cmd/ssh/ssh.c - 664 sys sys 1066515693 9667
 sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086
 sys/src/cmd/ssh/sshnet.c - 664 sys sys 1078840016 17641

dist/replica/plan9.log

@@ -16595,3 +16595,10 @@
 1092148238 0 c sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1092148201 357
 1092148238 1 c sys/src/cmd/aux/acidleak.c - 664 sys sys 1092148212 5940
 1092195046 0 c 386/bin/aux/acidleak - 775 sys sys 1092193654 67378
+1092493844 0 c sys/src/cmd/ssh/smsg.c - 664 sys sys 1092493367 6136
+1092516640 0 c sys/src/cmd/ssh/msg.c - 664 sys sys 1092516579 8102
+1092516640 1 c sys/src/cmd/ssh/smsg.c - 664 sys sys 1092516575 6374
+1092540653 0 c 386/bin/scp - 775 sys sys 1092539157 149860
+1092540653 1 c 386/bin/ssh - 775 sys sys 1092539158 208978
+1092540653 2 c 386/bin/aux/sshserve - 775 sys sys 1092539157 249442
+1092540653 3 c 386/bin/sshnet - 775 sys sys 1092539158 280678

sys/src/cmd/ssh/msg.c

@@ -102,6 +102,7 @@ allocmsg(Conn *c, int type, int len)
 void
 unrecvmsg(Conn *c, Msg *m)
 {
+	debug(DBG_PROTO, "unreceived %s len %d\n", msgnames[m->type], m->ep - m->rp);
 	free(c->unget);
 	c->unget = m;
 }

sys/src/cmd/ssh/smsg.c

@@ -170,8 +170,17 @@ authsrvuser(Conn *c)
 
 	ai = authusername(c);
 	while(ai == nil){
+		/*
+		 * clumsy: if the client aborted the auth_tis early
+		 * we don't send a new failure.  we check this by
+		 * looking at c->unget, which is only used in that
+		 * case.
+		 */
+		if(c->unget != nil)
+			goto skipfailure;
 		sendmsg(allocmsg(c, SSH_SMSG_FAILURE, 0));
-		m = recvmsg(c, 0);
+	skipfailure:
+		m = recvmsg(c, -1);
 		for(i=0; i<c->nokauthsrv; i++)
 			if(c->okauthsrv[i]->firstmsg == m->type){
 				ai = (*c->okauthsrv[i]->fn)(c, m);