From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 15 Aug 2008 18:58:34 +0000 (-0400)
Subject: sigh.  fixing some dumb typos in hostname revocation.
X-Git-Tag: monkeysphere_0.8-1~13^2~3
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=84b775ff0b36ec4b86e6708844ad2d678eced403;hp=617f03c948b66774e6765206bed2c56d30157187;p=monkeysphere.git

sigh.  fixing some dumb typos in hostname revocation.
---

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 6ffd41f..dd85dcc 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -413,9 +413,9 @@ revoke_hostname() {
     fi
 
     fpr=$(fingerprint_server_key)
-    tmpuidMatch="u:$(escape "$1")"
+    tmpuidMatch="u:$(escape "ssh://$1")"
 
-    if linenum=$(gpg_host --list-keys --with-colons --fixed-list-mode "$fpr" | egrep '^(uid|uat):' | cut -f2,10 -d: | grep -n -x -F 'r:Foo T. Bar (DO NOT USE!) <foo@example.net>') ; then
+    if linenum=$(gpg_host --list-keys --with-colons --fixed-list-mode "0x$fpr"\! | egrep '^(uid|uat):' | cut -f2,10 -d: | grep -n -x -F "$tmpuidMatch") ; then
 	uidNum=${linenum%%:*}
     else
 	failure "no non-revoked hostname '$1' is listed."
@@ -436,7 +436,7 @@ save
 EOF
 )
 
-    echo "$revuidCommand" | gpg_host --quiet --command-fd 0 --edit-key "0x$fingerprint"\!
+    echo "$revuidCommand" | gpg_host --quiet --command-fd 0 --edit-key "0x$fpr"\!
 
     echo "NOTE: host userID revokation has not been published."
     echo "Use '$PGRM publish-key' to publish these changes."