Fix how version number is saved/retrieved. Version is now stored in

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index baa7a87bf482f13706c1414a9f3f9e2056d5a689..c454354f5b60fd1e85d541401021d25614cd5045 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -163,6 +163,8 @@ find_host_userid() {
 # show info about the host key
 show_key() {
     local GNUPGHOME
+    local TMPSSH
+    local revokers
 
     # tmp gpghome dir
     export GNUPGHOME=$(msmktempdir)
@@ -184,12 +186,22 @@ show_key() {
     # list the host key info
     # FIXME: make no-show-keyring work so we don't have to do the grep'ing
     # FIXME: can we show uid validity somehow?
-    # FIXME: show revokers as well
     gpg --list-keys --fingerprint \
        --list-options show-unusable-uids 2>/dev/null \
        | grep -v "^${GNUPGHOME}/pubring.gpg$" \
        | egrep -v '^-+$'
 
+    # list revokers, if there are any
+    revokers=$(gpg --list-keys --with-colons --fixed-list-mode \
+       | awk -F: '/^rvk:/{ print $10 }' )
+    if [ "$revokers" ] ; then
+       echo "The following keys are allowed to revoke this host key:"
+       for key in $revokers ; do
+           echo "revoker: $key"
+       done
+       echo
+    fi
+
     # list the pgp fingerprint
     echo "OpenPGP fingerprint: $HOST_FINGERPRINT"
 
@@ -303,7 +315,7 @@ case $COMMAND in
        ;;
 
     'version'|'v')
-       echo "$VERSION"
+       version
        ;;
 
     '--help'|'help'|'-h'|'h'|'?')