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 b03e0d02833f84ac3bc06625bc58266f97187979..9889e76e62bb28391bd83d3de0c654f9a853550e 100644 (file)
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -21,7 +21,17 @@ local extendTo
 # get the new expiration date
 extendTo=$(get_gpg_expiration "$1")
 
-log info "setting host key expiration to ${extendTo}:"
+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
@@ -29,7 +39,9 @@ $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