shithub: drawterm

Info  •  Files  •  Log  •  Branches

cpu: fix p9any v.2 negotiation

--- a/cpu.c

+++ b/cpu.c

@@ -29,7 +29,7 @@

 static char	*system;

 static int	cflag;

 extern int	dbg;

-extern char*	base;	// fs base for devroot

+extern char*   base;   // fs base for devroot 

 static char	*srvname = "ncpu";

 static char	*ealgs = "rc4_256 sha1";

@@ -169,15 +169,15 @@

 	if(mountfactotum() < 0){

 		if(secstoreserver == nil)

 			secstoreserver = authserver;

-	        if(havesecstore(secstoreserver, user)){

-	                s = secstorefetch(secstoreserver, user, nil);

-	                if(s){

-	                        if(strlen(s) >= sizeof secstorebuf)

-	                                sysfatal("secstore data too big");

-	                        strcpy(secstorebuf, s);

-	                }

-	        }

-	}

+	 	if(havesecstore(secstoreserver, user)){

+			s = secstorefetch(secstoreserver, user, nil);

+			if(s){

+				if(strlen(s) >= sizeof secstorebuf)

+					sysfatal("secstore data too big");

+				strcpy(secstorebuf, s);

+			}

+		}

+	}

 	if((err = rexcall(&data, system, srvname)))

 		fatal(1, "%s: %s", err, system);

@@ -560,6 +560,7 @@

 	if((afd = open("/mnt/factotum/ctl", ORDWR)) >= 0)

 		return p9anyfactotum(fd, afd);

+	werrstr("");

 	if(readstr(fd, buf, sizeof buf) < 0)

 		fatal(1, "cannot read p9any negotiation");

@@ -582,8 +583,8 @@

 	if(write(fd, buf2, strlen(buf2)+1) != strlen(buf2)+1)

 		fatal(1, "cannot write user/domain choice in p9any");

 	if(v2){

-		if(readstr(fd, buf, sizeof buf) != 3)

-			fatal(1, "cannot read OK in p9any");

+		if(readstr(fd, buf, sizeof buf) < 0)

+			fatal(1, "cannot read OK in p9any: got %d %s", n, buf);

 		if(memcmp(buf, "OK\0", 3) != 0)

 			fatal(1, "did not get OK in p9any");

 	}