X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fcommon;h=24decae5dec4ebc28408934c734b0015c351136d;hb=b0ea15c8e359a908583e08da0663d69e353c77dc;hp=9c76bd1e7e236b1d7183e1c6236ee70e083b9ee4;hpb=5c1046f14ff2e1efda332aa07747661abca0b98f;p=monkeysphere.git

diff --git a/src/common b/src/common
index 9c76bd1..24decae 100644
--- a/src/common
+++ b/src/common
@@ -76,6 +76,13 @@ unescape() {
     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))