summaryrefslogtreecommitdiff
path: root/src/share/mh
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/share/mh
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/share/mh')
-rw-r--r--src/share/mh/add_hostname2
-rw-r--r--src/share/mh/add_revoker2
-rw-r--r--src/share/mh/import_key2
-rw-r--r--src/share/mh/revoke_hostname2
-rw-r--r--src/share/mh/set_expire2
5 files changed, 9 insertions, 1 deletions
diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index 46326bb..910faf6 100644
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -51,6 +51,8 @@ EOF
# execute edit-key script
if echo "$adduidCommand" | gpg_host_edit ; then
+ update_gpg_pub_file
+
show_key
echo
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index b6affbb..1464ae8 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -97,6 +97,8 @@ failure "not implemented yet!"
if echo "$addrevokerCommand" | \
gpg_core_edit ; then
+ update_gpg_pub_file
+
log info "Revoker added."
else
failure "Problem adding revoker."
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index ed6ee4f..6f12b7f 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -61,7 +61,7 @@ printf "%s:6:\n" "$HOST_FINGERPRINT" | gpg_host --import-ownertrust
gpg_host --check-trustdb
# export to gpg public key to file
-create_gpg_pub_file
+update_gpg_pub_file
# show info about new key
show_key
diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 3addf90..99ba603 100644
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -65,6 +65,8 @@ EOF
# execute edit-key script
if echo "$revuidCommand" | gpg_host_edit ; then
+ update_gpg_pub_file
+
show_key
echo
diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index b03e0d0..0b581d9 100644
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -29,6 +29,8 @@ $extendTo
save
EOF
+update_gpg_pub_file
+
cat <<EOF | log info
NOTE: Host key expiration date adjusted, but not yet published.
Run '$PGRM publish-key' to publish the new expiration date.