X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-keys/blobdiff_plain/0a155096e0d101cb30fbeccdfb630e0f14c0aaf9..e9cf707985f070cf5992f1bb112df58e532e01ca:/keyfunc.sh.in diff --git a/keyfunc.sh.in b/keyfunc.sh.in index 5b6320e..38ca243 100644 --- a/keyfunc.sh.in +++ b/keyfunc.sh.in @@ -339,9 +339,10 @@ subst () { } read_profile () { - profile=$1 + owner=$1 profile=$2 ## 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 @@ -349,7 +350,7 @@ read_profile () { label=${profile#:} uservp=nil ;; *) - user=$USERV_USER label=$profile uservp=t + user=$kowner 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 - read_profile "$profile" + read_profile $kowner "$profile" ## Check whether we're allowed to do this thing. This is annoyingly ## fiddly.