Merge commit 'jrollins/master'

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

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 653149fe1957f73b3c0d1f7ed4c4a7499fc6700e..14d2501b6928d5a87f33989cfb3825be2b3bf53f 100644 (file)
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -21,11 +21,25 @@ local extendTo
 # get the new expiration date
 extendTo=$(get_gpg_expiration "$1")
 
+if [ "$PROMPT" = "true" ] ; then
+    read -p "Are you sure you want to change the expiration on the host key to '$extendTo'? (y/N) " OK; OK=${OK:-N}
+    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
 
+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.