git: 9front

Info  •  Files  •  Log  •  Branches

aux/wpa: make sure essid is configured, dont make factotum ask for essid

--- a/sys/src/cmd/aux/wpa.c

+++ b/sys/src/cmd/aux/wpa.c

@@ -398,19 +398,19 @@

 	if((fd = dial(addr, nil, devdir, &cfd)) < 0)

 		sysfatal("dial: %r");

-	if(essid[0] != 0)

+	if(essid[0] != 0){

 		if(fprint(cfd, "essid %s", essid) < 0)

 			sysfatal("write essid: %r");

+	} else {

+		getessid();

+		if(essid[0] == 0)

+			sysfatal("no essid set");

+	}

 	if(prompt){

 		char *s;

-		if(essid[0] == 0)

-			getessid();

-		if(essid[0] != 0)

-			s = smprint("proto=wpapsk essid=%q !password?", essid);

-		else

-			s = smprint("proto=wpapsk essid? !password?");

+		s = smprint("proto=wpapsk essid=%q !password?", essid);

 		auth_getkey(s);

 		free(s);

 	}

-- 

⑨