X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-host;h=0b37ba98e7ca3dcc6581bdf72e7a72ae87ed76fa;hb=a8aa9a5f0d1d1e3832fee0b36f3462992bb5d142;hp=4c978c94809b3075056d5b9045b61b3b207a0629;hpb=b2bf2d17cd6eb5edcb69d51867b7d17e60751986;p=monkeysphere.git

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 4c978c9..0b37ba9 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -107,18 +107,12 @@ check_host_keyring() {
 show_key() {
     local fingerprintPGP
     local fingerprintSSH
-    local ret=0
 
     # FIXME: you shouldn't have to be root to see the host key fingerprint
-    if is_root ; then
-	check_host_keyring
-	fingerprintPGP=$(fingerprint_server_key)
-	gpg_authentication "--fingerprint --list-key --list-options show-unusable-uids $fingerprintPGP" 2>/dev/null
-	echo "OpenPGP fingerprint: $fingerprintPGP"
-    else
-	log info "You must be root to see host OpenPGP fingerprint."
-	ret='1'
-    fi
+    check_host_keyring
+    fingerprintPGP=$(fingerprint_server_key)
+    gpg_host "--fingerprint --list-key --list-options show-unusable-uids $fingerprintPGP" 2>/dev/null
+    echo "OpenPGP fingerprint: $fingerprintPGP"
 
     if [ -f "${SYSDATADIR}/ssh_host_rsa_key.pub" ] ; then
 	fingerprintSSH=$(ssh-keygen -l -f "${SYSDATADIR}/ssh_host_rsa_key.pub" | \
@@ -126,10 +120,7 @@ show_key() {
 	echo "ssh fingerprint: $fingerprintSSH"
     else
 	log info "SSH host key not found."
-	ret='1'
     fi
-
-return $ret
 }
 
 ########################################################################