Check for a host key before running monkeysphere-host diagnostics

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 60b627a63d631cc82f81081edae506b581c6bb18..d49806560a64b5af26111914bb834fb76dbcc36d 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -226,7 +226,7 @@ LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=$LOG_LEVEL}
 KEYSERVER=${MONKEYSPHERE_KEYSERVER:=$KEYSERVER}
 CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$CHECK_KEYSERVER}
 MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=$MONKEYSPHERE_USER}
-MONKEYSPHERE_GROUP=$(groups "$MONKEYSPHERE_USER" | cut -d: -f2 | awk '{ print $1 }')
+MONKEYSPHERE_GROUP=$(get_primary_group "$MONKEYSPHERE_USER")
 PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT}
 
 # other variables
@@ -306,6 +306,7 @@ case $COMMAND in
        ;;
 
     'diagnostics'|'d')
+       check_host_no_key
        load_fingerprint
        source "${MHSHAREDIR}/diagnostics"
        diagnostics