diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | appl/cmd/getauthinfo.b | 7 | ||||
| -rw-r--r-- | dis/getauthinfo.dis | bin | 3429 -> 3425 bytes |
3 files changed, 5 insertions, 4 deletions
@@ -1,3 +1,5 @@ +20140105 + incorrect check on keyname in getauthinfo [issue 306] 20130906 remove redundant code 20130529 diff --git a/appl/cmd/getauthinfo.b b/appl/cmd/getauthinfo.b index 84c0f1d4..1f561bcd 100644 --- a/appl/cmd/getauthinfo.b +++ b/appl/cmd/getauthinfo.b @@ -63,7 +63,7 @@ init(nil: ref Draw->Context, argv: list of string) user := user(); path := keyname; - if(path[0] != '/' || len path < 2 || path[0:2] != "./") + if(path[0] != '/' && (len path < 2 || path[0:2] != "./")) path = "/usr/" + user + "/keyring/" + keyname; signer := defaultsigner(); @@ -74,7 +74,6 @@ init(nil: ref Draw->Context, argv: list of string) passwd := ""; save := "yes"; - redo := "yes"; for(;;) { signer = promptstring("use signer", signer, RAWOFF); user = promptstring("remote user name", user, RAWOFF); @@ -144,7 +143,7 @@ infofile(fileio: ref Sys->FileIO, sync: chan of int) sync <-= 1; for(;;) alt { - (off, nbytes, fid, rc) := <-fileio.read => + (off, nbytes, nil, rc) := <-fileio.read => if(rc == nil) break; if(off > len infodata){ @@ -155,7 +154,7 @@ infofile(fileio: ref Sys->FileIO, sync: chan of int) rc <-= (infodata[off:off+nbytes], nil); } - (off, data, fid, wc) := <-fileio.write => + (off, data, nil, wc) := <-fileio.write => if(wc == nil) break; diff --git a/dis/getauthinfo.dis b/dis/getauthinfo.dis Binary files differindex 8a864a57..bbb5ec83 100644 --- a/dis/getauthinfo.dis +++ b/dis/getauthinfo.dis |