Merge commit 'greg/master'

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index ebd29c81754bf7103e0b6f21f9cb51914add333d..d49806560a64b5af26111914bb834fb76dbcc36d 100755 (executable)
--- 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