X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Frevoke_hostname;h=5dc327f02c8a65a97e1fa4dd4dae1289bb15bc85;hb=dfd67a14003fbfb4b1ba2269e7d47f4d0c44fcf8;hp=99ba60350a569703290d3fdb49391d4cec32ef4b;hpb=5eab477a9755178abf56eeba5f658db882611eec;p=monkeysphere.git

diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 99ba603..5dc327f 100644
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -28,7 +28,7 @@ if [ -z "$1" ] ; then
 fi
 
 echo "WARNING: There is a known bug in this function."
-echo "This function has been known to occasionally revoke the wrong user ID."
+echo "This function has been known to occasionally revoke the wrong hostname."
 echo "Please see the following bug report for more information:"
 echo "https://labs.riseup.net/code/issues/show/422"
 read -p "Are you sure you would like to proceed? (y/N) " OK; OK=${OK:=N}
@@ -42,25 +42,27 @@ userID="ssh://${1}"
 uidIndex=$(find_host_userid) || \
     failure "No non-revoked user ID found matching '$userID'."
 
-echo "The following host key user ID will be revoked:"
-echo "  $userID"
-read -p "Are you sure you would like to revoke this user ID? (y/N) " OK; OK=${OK:=N}
-if [ ${OK/y/Y} != 'Y' ] ; then
-    failure "User ID not revoked."
+if [ "$PROMPT" = "true" ] ; then
+    read -p "The following host key user ID will be revoked:
+  $userID
+Are you sure you would like to revoke this user ID? (Y/n) " OK; OK=${OK:=Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
+	failure "User ID not revoked."
+    fi
+else
+    log debug "revoking user ID without prompting."
 fi
 
 # edit-key script command to revoke user ID
-revuidCommand=$(cat <<EOF
-$uidIndex
+revuidCommand="$uidIndex
 revuid
 y
 4
 Hostname removed by monkeysphere-host: $DATE
 
 y
-save
-EOF
-    )	
+save"
+# end script
 
 # execute edit-key script
 if echo "$revuidCommand" | gpg_host_edit ; then