Merge commit 'mlcastle/master'

[monkeysphere.git] / src / share / mh / set_expire

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 2389e573515505f9d6bdb66e3708680836bcbc56..9889e76e62bb28391bd83d3de0c654f9a853550e 100644 (file)
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -14,19 +14,34 @@
 # They are Copyright 2008-2009, and are all released under the GPL,
 # version 3 or later.
 
-set-expire() {
+set_expire() {
 
 local extendTo
 
 # get the new expiration date
 extendTo=$(get_gpg_expiration "$1")
 
+if [ "$PROMPT" = "true" ] ; then
+    printf "Are you sure you want to change the expiration on the host key to '%s'? (Y/n) " "$extendTo" >&2
+    read OK; OK=${OK:-Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
+       failure "expiration not set."
+    fi
+else
+    log debug "extending without prompting."
+fi
+
+log info "setting host key expiration to ${extendTo}."
+
+log debug "executing host expire script..."
 gpg_host_edit expire <<EOF
 $extendTo
 save
 EOF
 
-cat <<EOF | log info
+update_gpg_pub_file
+
+log info <<EOF
 NOTE: Host key expiration date adjusted, but not yet published.
 Run '$PGRM publish-key' to publish the new expiration date.
 EOF