diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | appl/cmd/auth/secstore.b | 21 | ||||
| -rw-r--r-- | dis/auth/secstore.dis | bin | 5754 -> 5584 bytes | |||
| -rw-r--r-- | include/version.h | 2 |
4 files changed, 8 insertions, 17 deletions
@@ -1,3 +1,5 @@ +20080304 + auth/secstore uses dial module 20080210 add auth/dsagen 20080204 diff --git a/appl/cmd/auth/secstore.b b/appl/cmd/auth/secstore.b index 5a63b78d..9cb731ee 100644 --- a/appl/cmd/auth/secstore.b +++ b/appl/cmd/auth/secstore.b @@ -9,6 +9,9 @@ include "sys.m"; include "draw.m"; +include "dial.m"; + dial: Dial; + include "bufio.m"; bufio: Bufio; Iobuf: import bufio; @@ -37,6 +40,7 @@ init(nil: ref Draw->Context, args: list of string) sys = load Sys Sys->PATH; bufio = load Bufio Bufio->PATH; secstore = load Secstore Secstore->PATH; + dial = load Dial Dial->PATH; sys->pctl(Sys->FORKFD, nil); stderr = sys->fildes(2); @@ -108,7 +112,7 @@ Auth: filekey = secstore->mkfilekey(pass); for(i := 0; i < len pass; i++) pass[i] = 0; # clear it - conn = secstore->dial(netmkaddr(addr, "net", "secstore")); + conn = secstore->dial(dial->netmkaddr(addr, "net", "secstore")); if(conn == nil) error(sys->sprint("can't connect to secstore: %r")); (srvname, diag) := secstore->auth(conn, user, seckey); @@ -300,18 +304,3 @@ readfile(f: string): string return ""; return string buf[0:n]; } - -netmkaddr(addr, net, svc: string): string -{ - if(net == nil) - net = "net"; - (n, nil) := sys->tokenize(addr, "!"); - if(n <= 1){ - if(svc== nil) - return sys->sprint("%s!%s", net, addr); - return sys->sprint("%s!%s!%s", net, addr, svc); - } - if(svc == nil || n > 2) - return addr; - return sys->sprint("%s!%s", addr, svc); -} diff --git a/dis/auth/secstore.dis b/dis/auth/secstore.dis Binary files differindex 2157815d..3edff631 100644 --- a/dis/auth/secstore.dis +++ b/dis/auth/secstore.dis diff --git a/include/version.h b/include/version.h index 337a504d..b50fad67 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20080210)" +#define VERSION "Fourth Edition (20080304)" |