diff options
| author | Matt Goins <mjgoins@openflows.com> | 2009-01-31 23:59:15 -0500 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2009-01-31 23:59:15 -0500 |
| commit | a8aa9a5f0d1d1e3832fee0b36f3462992bb5d142 (patch) | |
| tree | 2019f0654e3df9f4f82c0a7b6656f5716bea8085 /src/monkeysphere-host | |
| parent | b5cdb9cff70a5ab6982e79c7acd0c9bc0a010c49 (diff) | |
| parent | bbbc5bb8accf1db41d6a95e227f028376823cddf (diff) | |
Merge commit 'jrollins/master'
Diffstat (limited to 'src/monkeysphere-host')
| -rwxr-xr-x | src/monkeysphere-host | 17 |
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 } ######################################################################## |