From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 11 Jul 2009 22:47:10 +0000 (-0400)
Subject: Merge commit 'greg/master'
X-Git-Tag: monkeysphere_0.25~25^2~1
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e6c612d023a2e4d21bd80632e241f4b016b0685a;hp=0755ca307728b516cb1727d5f7a5d7547676d573;p=monkeysphere.git

Merge commit 'greg/master'
---

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index ebd29c8..d498065 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -306,6 +306,7 @@ case $COMMAND in
 	;;
 
     'diagnostics'|'d')
+	check_host_no_key
 	load_fingerprint
 	source "${MHSHAREDIR}/diagnostics"
 	diagnostics