4 files changed, 12 insertions(+), 14 deletions(-)

M boot/boot.c
M boot/boot.h
M boot/doauthenticate.c
M port/devns16552.c

@@ 19,7 19,6 @@ int	mflag;
 int	fflag;
 int	kflag;
 int	aflag;
-int	afd = -1;
 
 char	*bargv[Nbarg];
 int	bargc;


@@ 153,7 152,6 @@ boot(int argc, char *argv[])
 	}
 
 	settime(islocal);
-	close(afd);
 	swapproc();
 
 	sprint(cmd, "/%s/init", cputype);

@@ 28,7 28,6 @@ enum
 };
 extern int	bargc;
 extern char	*bargv[Nbarg];
-extern int	afd;
 
 /* libc equivalent */
 extern int	cache(int);

@@ 22,22 22,21 @@ readn(int fd, char *buf, int len)
 static char*
 fromauth(Method *mp, char *trbuf, char *tbuf)
 {
+	int afd;
 	char t;
 	char *msg;
 	static char error[2*ERRLEN];
 
-	if(afd < 0){
-		if(mp->auth == 0)
-			fatal("no method for accessing auth server");
-		afd = (*mp->auth)();
-		if(afd < 0) {
-			sprint(error, "%s: %r", ccmsg);
-			return error;
-		}
+	if(mp->auth == 0)
+		fatal("no method for accessing auth server");
+	afd = (*mp->auth)();
+	if(afd < 0) {
+		sprint(error, "%s: %r", ccmsg);
+		return error;
 	}
+
 	if(write(afd, trbuf, TICKREQLEN) < 0 || read(afd, &t, 1) != 1){
 		close(afd);
-		afd = -1;
 		sprint(error, "%s: %r", pbmsg);
 		return error;
 	}


@@ 63,6 62,8 @@ fromauth(Method *mp, char *trbuf, char *tbuf)
 		msg = pbmsg;
 		break;
 	}
+
+	close(afd);
 	return msg;
 }
 

@@ 359,7 359,7 @@ ns16552disable(Uart *p)
 	Uart **l;
 
 	/*
- 	 *  turn off interrpts
+ 	 *  turn off interrupts
 	 */
 	p->sticky[Iena] = 0;
 	uartwrreg(p, Iena, 0);


@@ 462,7 462,7 @@ ns16552setup0(Uart *p)
 	 *  set rate to 9600 baud.
 	 *  8 bits/character.
 	 *  1 stop bit.
-	 *  interrpts enabled.
+	 *  interrupts enabled.
 	 */
 	p->sticky[Format] = Bits8;
 	uartwrreg(p, Format, 0);