diff options
author | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-06-02 00:24:42 +0200 |
---|---|---|
committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2013-06-02 00:24:42 +0200 |
commit | d3773c43550ee5ce00eb3760f1faf58897a224f7 (patch) | |
tree | c2b5a7334b1b07001a03e066b0bd275384957917 /sys | |
parent | bf2dd0c6bdc79e4e0b048f0c9a19b8bfc09f59d3 (diff) |
aux/wpa: make sure essid is configured, dont make factotum ask for essid
Diffstat (limited to 'sys')
-rw-r--r-- | sys/src/cmd/aux/wpa.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/src/cmd/aux/wpa.c b/sys/src/cmd/aux/wpa.c index f3dacc71c..f97116296 100644 --- a/sys/src/cmd/aux/wpa.c +++ b/sys/src/cmd/aux/wpa.c @@ -398,19 +398,19 @@ main(int argc, char *argv[]) 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); } |