fi
# prompt about key expiration if not specified
- if [ -z "$keyExpire" ] ; then
- keyExpire=$(get_gpg_expiration)
- fi
- if ! test_gpg_expire "$keyExpire" ; then
- failure "invalid key expiration value '$keyExpire'."
- fi
+ keyExpire=$(get_gpg_expiration "$keyExpire")
# set key parameters
keyParameters=$(cat <<EOF
failure "You don't appear to have a MonkeySphere host key on this server. Try 'monkeysphere-server gen-key' first."
fi
- if [ -z "$extendTo" ]; then
- extendTo=$(get_gpg_expiration)
- fi
- if ! test_gpg_expire "$extendTo" ; then
- failure "invalid expiration value '$extendTo'."
- fi
+ # get the new expiration date
+ extendTo=$(get_gpg_expiration "$extendTo")
gpg_host --quiet --command-fd 0 --edit-key "$fpr" <<EOF
expire
echo "WARNING: There is a known bug in this function."
echo "This function has been known to occasionally revoke the wrong user ID."
echo "Please see the following bug report for more information:"
- echo "http://monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/"
+ echo "http://web.monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/"
read -p "Are you sure you would like to proceed? (y/N) " OK; OK=${OK:=N}
if [ ${OK/y/Y} != 'Y' ] ; then
failure "aborting."