projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'dkg/master'
[monkeysphere.git]
/
src
/
subcommands
/
mh
/
revoke-hostname
diff --git
a/src/subcommands/mh/revoke-hostname
b/src/subcommands/mh/revoke-hostname
old mode 100755
(executable)
new mode 100644
(file)
index
decac86
..
b519cf6
--- a/
src/subcommands/mh/revoke-hostname
+++ b/
src/subcommands/mh/revoke-hostname
@@
-1,17
+1,20
@@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host revoke-hostname subcommand
#
# The monkeysphere scripts are written by:
# Monkeysphere host revoke-hostname subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fi
fthhorseman
.net>
+# Jameson Rollins <jrollins@fi
nestructure
.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008
, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008
-2009, and are all released under the GPL,
+#
version 3
or later.
# revoke hostname user ID from host key
# revoke hostname user ID from host key
+revoke_hostname() {
+
local userID
local fingerprint
local tmpuidMatch
local userID
local fingerprint
local tmpuidMatch
@@
-76,10
+79,7
@@
EOF
if echo "$revuidCommand" | \
gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then
if echo "$revuidCommand" | \
gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then
- # update the trustdb for the authentication keyring
- gpg_authentication "--check-trustdb"
-
- show_server_key
+ show_key
echo
echo "NOTE: User ID revoked, but revocation not published."
echo
echo "NOTE: User ID revoked, but revocation not published."
@@
-87,3
+87,5
@@
if echo "$revuidCommand" | \
else
failure "Problem revoking user ID."
fi
else
failure "Problem revoking user ID."
fi
+
+}