fix bug i accidentally introduced in the diagnostic function

[monkeysphere.git] / src / monkeysphere-server

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 6754b2321e9c55cea9d7d9d3bbc709a19a5ee1ad..ea946189152752c01974e62c9fe5c3b6856aac69 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -446,6 +446,15 @@ revoke_hostname() {
        failure "You must specify a hostname to revoke."
     fi
 
+    echo "WARNING: There is a known bug in this function."
+    echo "This function has been known to occasionally revoke the wrong user ID."
+    echo "Please see the following bug report for more information:"
+    echo "http://monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/"
+    read -p "Are you sure you would like to proceed? (y/N) " OK; OK=${OK:=N}
+    if [ ${OK/y/Y} != 'Y' ] ; then
+       failure "aborting."
+    fi
+
     userID="ssh://${1}"
 
     fingerprint=$(fingerprint_server_key)
@@ -530,7 +539,7 @@ diagnostics() {
 
     # FIXME: what's the correct, cross-platform answer?
     sshd_config=/etc/ssh/sshd_config
-    seckey=$(fingerprint_server_key)
+    seckey=$(gpg_host --list-secret-keys --with-colons --fixed-list-mode)
     keysfound=$(echo "$seckey" | grep -c ^sec:)
     curdate=$(date +%s)
     # warn when anything is 2 months away from expiration