fixing bugs in monkeysphere-server diagnostics.

[monkeysphere.git] / src / common

diff --git a/src/common b/src/common
index cbfa95693c307782081b4c728206186f645601b7..24decae5dec4ebc28408934c734b0015c351136d 100644 (file)
--- a/src/common
+++ b/src/common
@@ -73,9 +73,16 @@ file_hash() {
 # character
 # FIXME: undo all escape character translation in with-colons gpg output
 unescape() {
-    echo "$1" | sed 's/\\x3a/:/'
+    echo "$1" | sed 's/\\x3a/:/g'
 }
 
+# convert nasty chars into gpg-friendly form
+# FIXME: escape everything, not just colons!
+escape() {
+    echo "$1" | sed 's/:/\\x3a/g'
+}
+
+
 # remove all lines with specified string from specified file
 remove_line() {
     local file
@@ -484,7 +491,10 @@ process_user_id() {
                fi
                ;;
        esac
-    done
+    done | sort -t: -k1 -n -r
+    # NOTE: this last sort is important so that the "good" keys (key
+    # flag '0') come last.  This is so that they take precedence when
+    # being processed in the key files over "bad" keys (key flag '1')
 }
 
 # process a single host in the known_host file
@@ -498,16 +508,15 @@ process_host_known_hosts() {
     local tmpfile
 
     host="$1"
+    userID="ssh://${host}"
 
     log "processing: $host"
 
-    userID="ssh://${host}"
-
     nKeys=0
     nKeysOK=0
 
     IFS=$'\n'
-    for line in $(process_user_id "ssh://${host}") ; do
+    for line in $(process_user_id "${userID}") ; do
        # note that key was found
        nKeys=$((nKeys+1))