projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename create_gpg_pub_file to be update_gpg_pub_file, and add it to
[monkeysphere.git]
/
src
/
monkeysphere-host
diff --git
a/src/monkeysphere-host
b/src/monkeysphere-host
index 9d3ccb1a6a9858e2c11716b1676a5f87361070d8..a7b9697506322d031348bbdddf99de588bf9501a 100755
(executable)
--- 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
}
# export the host public key to the monkeysphere gpg pub key file
-
cre
ate_gpg_pub_file() {
- log debug "
creating openpgp public key file
..."
+
upd
ate_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"
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
}
# 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" ] \
# 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
}
# 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
# 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$" \
gpg --list-keys --fingerprint \
--list-options show-unusable-uids 2>/dev/null \
| grep -v "^${GNUPGHOME}/pubring.gpg$" \