summaryrefslogtreecommitdiff
path: root/src/monkeysphere-host
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-17 02:23:17 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-17 02:23:17 -0500
commit5eab477a9755178abf56eeba5f658db882611eec (patch)
tree6094792af141061ccc467f891f60a3869135afa3 /src/monkeysphere-host
parentffe5855c75320bf35b6db1770b4ecbd0012723e8 (diff)
rename create_gpg_pub_file to be update_gpg_pub_file, and add it to
every function that alters the host keyring, so that all changes will show up in exported pub key file, and in show-key.
Diffstat (limited to 'src/monkeysphere-host')
-rwxr-xr-xsrc/monkeysphere-host10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 9d3ccb1..a7b9697 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -97,11 +97,10 @@ gpg_host_edit() {
}
# export the host public key to the monkeysphere gpg pub key file
-create_gpg_pub_file() {
- log debug "creating openpgp public key file..."
+update_gpg_pub_file() {
+ log debug "updating openpgp public key file '$HOST_KEY_FILE'..."
gpg_host --export --armor --export-options export-minimal \
"0x${HOST_FINGERPRINT}!" > "$HOST_KEY_FILE"
- log info "GPG host public key file: $HOST_KEY_FILE"
}
# load the host fingerprint into the fingerprint variable, using the
@@ -140,7 +139,8 @@ check_host_key() {
# fail if host key not present
check_host_no_key() {
[ -s "$HOST_KEY_FILE" ] \
- || failure "You don't appear to have a Monkeysphere host key on this server. Please run 'monkeysphere-host import-key' first."
+ || failure "You don't appear to have a Monkeysphere host key on this server.
+Please run 'monkeysphere-host import-key' first."
}
# output the index of a user ID on the host key
@@ -184,7 +184,7 @@ show_key() {
# list the host key info
# FIXME: make no-show-keyring work so we don't have to do the grep'ing
- # FIXME: why is this not showing key expiration?
+ # FIXME: can we show uid validity somehow?
gpg --list-keys --fingerprint \
--list-options show-unusable-uids 2>/dev/null \
| grep -v "^${GNUPGHOME}/pubring.gpg$" \