X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fset_expire;h=be3f6bb4b8cdc61ff8b28b046464b64ad3db640e;hp=63e5c5546addad6feb04356f3d29f81d9de488e8;hb=9307f58b4fdf8e139c4fd5de5c3a878b8b12d0b1;hpb=4465c13b93d3d4bc1cb59c5506775b4fc0274058

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 63e5c55..be3f6bb 100644
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -11,18 +11,33 @@
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 #
-# They are Copyright 2008-2009, and are all released under the GPL,
+# They are Copyright 2008-2010, and are all released under the GPL,
 # version 3 or later.
 
 set_expire() {
 
-local extendTo
+local extendBy
+local keyID
+
+if [ -z "$1" ] ; then
+    cat <<EOF >&2
+Must specify expiration.  The possibilities are:
+    0 = key does not expire
+ <n>  = key expires in n days
+ <n>w = key expires in n weeks
+ <n>m = key expires in n months
+ <n>y = key expires in n years
+EOF
+    failure
+fi
+extendBy="$1"
+shift
 
-# get the new expiration date
-extendTo=$(get_gpg_expiration "$1")
+keyID=$(check_key_input "$@")
 
 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}
+    printf "Are you sure you want to change the expiration on key '$keyID' by '%s'? (Y/n) " "$extendBy" >&2
+    read OK; OK=${OK:-Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
 	failure "expiration not set."
     fi
@@ -30,18 +45,18 @@ else
     log debug "extending without prompting."
 fi
 
-log info "setting host key expiration to ${extendTo}."
+log info "setting key expiration to ${extendBy}."
 
-log debug "executing host expire script..."
-gpg_host_edit expire <<EOF
-$extendTo
+log debug "executing key expire script..."
+gpg_host_edit "0x${keyID}!" expire <<EOF
+$extendBy
 save
 EOF
 
-update_gpg_pub_file
+update_pgp_pub_file
 
-cat <<EOF | log info
-NOTE: Host key expiration date adjusted, but not yet published.
+log info <<EOF
+NOTE: Key expiration date adjusted, but not yet published.
 Run '$PGRM publish-key' to publish the new expiration date.
 EOF