X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fcommon;h=bb988f785e983ad5bcb90492f3390b618ce2c737;hb=72a88981d0fbabb60b6094b43fb6e87b141e8b15;hp=cbfa95693c307782081b4c728206186f645601b7;hpb=70674cae8b3d69d0e750125387b26c0d5857c5ba;p=monkeysphere.git

diff --git a/src/common b/src/common
index cbfa956..bb988f7 100644
--- a/src/common
+++ b/src/common
@@ -69,11 +69,18 @@ file_hash() {
     md5sum "$1" 2> /dev/null
 }
 
-# convert escaped characters from gpg output back into original
-# character
-# FIXME: undo all escape character translation in with-colons gpg output
-unescape() {
-    echo "$1" | sed 's/\\x3a/:/'
+# convert escaped characters in pipeline from gpg output back into
+# original character
+# FIXME: undo all escape character translation in with-colons gpg
+# output
+gpg_unescape() {
+    sed 's/\\x3a/:/g'
+}
+
+# convert nasty chars into gpg-friendly form in pipeline
+# FIXME: escape everything, not just colons!
+gpg_escape() {
+    sed 's/:/\\x3a/g'
 }
 
 # remove all lines with specified string from specified file
@@ -398,7 +405,7 @@ process_user_id() {
 		    continue
 		fi
 		# if the user ID does not match, skip
-		if [ "$(unescape "$uidfpr")" != "$userID" ] ; then
+		if [ "$(echo "$uidfpr" | gpg_unescape)" != "$userID" ] ; then
 		    continue
 		fi
 		# if the user ID validity is not ok, skip
@@ -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))