summaryrefslogtreecommitdiff
path: root/src/monkeysphere-host
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-01-31 23:44:38 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-01-31 23:44:38 -0500
commitbbbc5bb8accf1db41d6a95e227f028376823cddf (patch)
tree6b579205e538dd7033ec78dbd373582f328c9311 /src/monkeysphere-host
parent2e534772b9b105ceabfe140d1552770b5c9d76ea (diff)
fix some things bugs from the separation transition, and try to fix the test scripts
Diffstat (limited to 'src/monkeysphere-host')
-rwxr-xr-xsrc/monkeysphere-host17
1 files changed, 4 insertions, 13 deletions
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
}
########################################################################