projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macports: fix perl dependencies, and add socat dependency
[monkeysphere.git]
/
src
/
share
/
mh
/
revoke_hostname
diff --git
a/src/share/mh/revoke_hostname
b/src/share/mh/revoke_hostname
index 12158287d47d490d045fb1530cb5fa46cf73e72d..5dc327f02c8a65a97e1fa4dd4dae1289bb15bc85 100644
(file)
--- a/
src/share/mh/revoke_hostname
+++ b/
src/share/mh/revoke_hostname
@@
-43,11
+43,9
@@
uidIndex=$(find_host_userid) || \
failure "No non-revoked user ID found matching '$userID'."
if [ "$PROMPT" = "true" ] ; then
failure "No non-revoked user ID found matching '$userID'."
if [ "$PROMPT" = "true" ] ; then
- cat <<EOF
-The following host key user ID will be revoked:
+ read -p "The following host key user ID will be revoked:
$userID
$userID
-EOF
- read -p "Are you sure you would like to revoke this user ID? (Y/n) " OK; OK=${OK:=Y}
+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
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "User ID not revoked."
fi
@@
-56,17
+54,15
@@
else
fi
# edit-key script command to revoke user ID
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
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
# execute edit-key script
if echo "$revuidCommand" | gpg_host_edit ; then