X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fset_expire;h=a6bf1f13ae5e33f42fade4091350f7a62993dbc0;hb=8ca3fdd64f5ca2827d262b402f7e2eac068966ef;hp=2389e573515505f9d6bdb66e3708680836bcbc56;hpb=770f45b0c1d72a1bb89fd98fe070a6dfdcc4c0bf;p=monkeysphere.git

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 2389e57..a6bf1f1 100644
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -14,19 +14,33 @@
 # 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
+    read -p "Are you sure you want to change the expiration on the host key to '$extendTo'? (Y/n) " 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