From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 19 Jan 2010 08:12:59 +0000 (-0500)
Subject: Merge remote branch 'jrollins/master'
X-Git-Tag: monkeysphere_0.28~4
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=351bf22e962c7ba6da5ee3d8cec9d77264673c88;hp=bef7e503b70c985c2d4386146fc5881e7ab3718e

Merge remote branch 'jrollins/master'
---

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