From 267c6fcda592494466beed500ef78ad955edea8c Mon Sep 17 00:00:00 2001 From: Jameson Rollins Date: Sun, 17 Oct 2010 19:14:31 -0400 Subject: fix keys-for-user This function now properly outputs to stdout exactly what would have been written to the monkeysphere-controlled authorized_keys file, but without actually touching it. --- src/monkeysphere-authentication | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/monkeysphere-authentication') diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication index c9f6634..4249d21 100755 --- a/src/monkeysphere-authentication +++ b/src/monkeysphere-authentication @@ -51,8 +51,8 @@ Monkeysphere authentication admin tool. subcommands: update-users (u) [USER]... update user authorized_keys files + keys-for-user (k) USER output user authorized_keys lines to stdout refresh-keys (r) refresh keys in keyring - keys-for-user (k) USER output valid keys for user add-id-certifier (c+) KEYID|FILE import and tsign a certification key [--domain (-n) DOMAIN] limit ID certifications to DOMAIN @@ -164,18 +164,20 @@ case $COMMAND in source "${MASHAREDIR}/setup" setup source "${MASHAREDIR}/update_users" - update_users "$@" + OUTPUT_STDOUT= update_users "$@" ;; - 'refresh-keys'|'refresh'|'r') + 'keys-for-user'|'k') source "${MASHAREDIR}/setup" setup - gpg_sphere --keyserver "$KEYSERVER" --refresh-keys + source "${MASHAREDIR}/update_users" + OUTPUT_STDOUT=true update_users "$1" ;; - 'keys-for-user'|'k') - source "${MASHAREDIR}/keys_for_user" - keys_for_user "$@" + 'refresh-keys'|'refresh'|'r') + source "${MASHAREDIR}/setup" + setup + gpg_sphere --keyserver "$KEYSERVER" --refresh-keys ;; 'add-identity-certifier'|'add-id-certifier'|'add-certifier'|'c+') -- cgit v1.2.3