diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | appl/cmd/mount.b | 2 | ||||
| -rw-r--r-- | dis/mount.dis | bin | 5767 -> 5767 bytes | |||
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | man/1/bind | 10 | ||||
| -rw-r--r-- | man/2/factotum | 4 |
6 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,7 @@ +20091215 + factotum(2) updated to include keyspec in signature + appl/cmd/mount.b uses -k value as keyspec if -9 selected [not to much purpose with current factotum's p9any] + bind(1) [for mount] updated to describe -k used for keyspec if -9 selected 20091214 switch more commands to use dial(2) change emu/Linux/emu-g not to require X11 libs (again) diff --git a/appl/cmd/mount.b b/appl/cmd/mount.b index 514db41a..5bf4fe7b 100644 --- a/appl/cmd/mount.b +++ b/appl/cmd/mount.b @@ -103,7 +103,7 @@ init(ctxt: ref Draw->Context, args: list of string) if(factotum == nil) nomod(Factotum->PATH); factotum->init(); - ok = factotum->mount(fd, mountpoint, flags, spec, nil).t0; + ok = factotum->mount(fd, mountpoint, flags, spec, keyfile).t0; }else{ err: string; if(!persist){ diff --git a/dis/mount.dis b/dis/mount.dis Binary files differindex 35463f5f..cf0f4ef6 100644 --- a/dis/mount.dis +++ b/dis/mount.dis diff --git a/include/version.h b/include/version.h index f26639e4..5c62a52c 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20091214)" +#define VERSION "Fourth Edition (20091215)" @@ -225,6 +225,9 @@ The default is See .IR keyring-auth (2) for more details. +(If the +.B -9 +option is given, this option is interpreted differently: see below.) .TP .B -9 For @@ -240,9 +243,12 @@ any Inferno host, by using the option to suppress Inferno authentication.) The existing Plan 9 file servers do not encrypt connections, so the .B -C -and +option is ignored. +The value of the .B -k -options are ignored. +option is added to the key specification for +.IR factotum (4) +for authentication. .TP .B -P When diff --git a/man/2/factotum b/man/2/factotum index 8fa475ac..338e6022 100644 --- a/man/2/factotum +++ b/man/2/factotum @@ -17,8 +17,8 @@ Authinfo: adt{ AuthRpcMax: con \fR...\fP; init: fn(); -mount: fn(fd: ref Sys->FD, mnt: string, flags: int, aname: string): - (int, ref Authinfo); +mount: fn(fd: ref Sys->FD, mnt: string, flags: int, + aname: string, keyspec: string): (int, ref Authinfo); getuserpasswd: fn(keyspec: string): (string, string); |