~mdw
/
distorted-keys
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cryptop.list: New tool for listing keys.
[distorted-keys]
/
keyfunc.sh.in
diff --git
a/keyfunc.sh.in
b/keyfunc.sh.in
index
5b6320e
..
38ca243
100644
(file)
--- a/
keyfunc.sh.in
+++ b/
keyfunc.sh.in
@@
-339,9
+339,10
@@
subst () {
}
read_profile () {
}
read_profile () {
- profile=$1
+ owner=$1 profile=$2
## Read property settings from a profile. The PROFILE name has the form
## Read property settings from a profile. The PROFILE name has the form
- ## [USER:]LABEL. Properties are set using `setprops' with prefix `kprop_'.
+ ## [USER:]LABEL; USER defaults to OWNER. Properties are set using
+ ## `setprops' with prefix `kprop_'.
reqtmp
case "$profile" in
reqtmp
case "$profile" in
@@
-349,7
+350,7
@@
read_profile () {
label=${profile#:} uservp=nil
;;
*)
label=${profile#:} uservp=nil
;;
*)
- user=$
USERV_USER
label=$profile uservp=t
+ user=$
kowner
label=$profile uservp=t
;;
*:*)
user=${profile%%:*} label=${profile#*:} uservp=t
;;
*:*)
user=${profile%%:*} label=${profile#*:} uservp=t
@@
-443,7
+444,7
@@
prepare () {
parse_keylabel "$key"
if [ ! -d $kdir ]; then echo >&2 "$quis: unknown key \`$key'"; exit 1; fi
readmeta $kdir
parse_keylabel "$key"
if [ ! -d $kdir ]; then echo >&2 "$quis: unknown key \`$key'"; exit 1; fi
readmeta $kdir
- read_profile "$profile"
+ read_profile
$kowner
"$profile"
## Check whether we're allowed to do this thing. This is annoyingly
## fiddly.
## Check whether we're allowed to do this thing. This is annoyingly
## fiddly.