summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-01-19 03:12:59 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-01-19 03:12:59 -0500
commit351bf22e962c7ba6da5ee3d8cec9d77264673c88 (patch)
treeadc8721f91d9e30b70b466848d522220776cf390 /src
parentbef7e503b70c985c2d4386146fc5881e7ab3718e (diff)
parent8e1bd67f860f921743237c3e83ec8d6dfeaa5315 (diff)
Merge remote branch 'jrollins/master'
Diffstat (limited to 'src')
-rwxr-xr-xsrc/monkeysphere-host3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 1733021..72205ad 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -256,11 +256,12 @@ multi_key() {
shift
local keys=$@
local i=0
- local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
local key
check_no_keys
+ local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
+
if [[ -z "$1" || "$1" == '--all' ]] ; then
keys="${fprs[@]}"
fi