X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-host;h=4ec533d5e5ff92dd9733ac3a4f4b339e0cf65333;hb=8af517bd1dc3eea66a64387af3e69188a536b2ee;hp=d49806560a64b5af26111914bb834fb76dbcc36d;hpb=e6c612d023a2e4d21bd80632e241f4b016b0685a;p=monkeysphere.git

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index d498065..4ec533d 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -134,28 +134,18 @@ check_host_no_key() {
 Please run 'monkeysphere-host import-key...' first."
 }
 
-# output the index of a user ID on the host key
-# return 1 if user ID not found
+# return 0 if user ID was found.
+# return 1 if user ID not found.
 find_host_userid() {
     local userID="$1"
     local tmpuidMatch
-    local line
 
-    # match to only ultimately trusted user IDs
-    tmpuidMatch="u:$(echo $userID | gpg_escape)"
+    # match to only "unknown" user IDs (host has no need for ultimate trust)
+    tmpuidMatch="uid:-:$(echo $userID | gpg_escape)"
 
-    # find the index of the requsted user ID
-    # NOTE: this is based on circumstantial evidence that the order of
-    # this output is the appropriate index
-    line=$(gpg_host_list | egrep '^(uid|uat):' | cut -f2,10 -d: | \
-	grep -n -x -F "$tmpuidMatch" 2>/dev/null)
-
-    if [ "$line" ] ; then
-	echo ${line%%:*}
-	return 0
-    else
-	return 1
-    fi
+    # See whether the requsted user ID is present
+    gpg_host_list | cut -f1,2,10 -d: | \
+	grep -q -x -F "$tmpuidMatch" 2>/dev/null
 }
 
 # show info about the host key
@@ -306,8 +296,6 @@ case $COMMAND in
 	;;
 
     'diagnostics'|'d')
-	check_host_no_key
-	load_fingerprint
 	source "${MHSHAREDIR}/diagnostics"
 	diagnostics
 	;;