X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon;h=0f98923805600d7d916aa3a1dc352193e627c6dd;hb=0c2c01095b4e3e707a08e9ff6ebe61f18689bcaa;hp=914c800a24d6d3471fc2f2eaaa477a47d085b5d2;hpb=c998145c57c19e026e5f6c8f400fb66a3f52e8d4;p=monkeysphere.git

diff --git a/src/common b/src/common
index 914c800..0f98923 100644
--- a/src/common
+++ b/src/common
@@ -23,14 +23,8 @@ failure() {
     exit ${2:-'1'}
 }
 
-# write output to stdout
-log() {
-    echo -n "ms: "
-    echo "$@"
-}
-
 # write output to stderr
-loge() {
+log() {
     echo -n "ms: " 1>&2
     echo "$@" 1>&2
 }
@@ -98,7 +92,7 @@ gpg2known_hosts() {
     echo -n "$host "
     gpg --export "$keyID" | \
 	openpgp2ssh "$keyID" | tr -d '\n'
-    echo "MonkeySphere${DATE}"
+    echo " MonkeySphere${DATE}"
 }
 
 # convert key from gpg to ssh authorized_keys format
@@ -109,9 +103,9 @@ gpg2authorized_keys() {
     keyID="$1"
     userID="$2"
 
-    echo -n "MonkeySphere${DATE}:${userID}"
     gpg --export "$keyID" | \
-	openpgp2ssh "$keyID"
+	openpgp2ssh "$keyID" | tr -d '\n'
+    echo " MonkeySphere${DATE}:${userID}"
 }
 
 # userid and key policy checking
@@ -153,7 +147,7 @@ process_user_id() {
 
     # return 1 if there only "tru" lines are output from gpg
     if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
-	loge "  key not found."
+	log "  key not found."
 	return 1
     fi
 
@@ -182,18 +176,18 @@ process_user_id() {
 
 		# check primary key validity
 		if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
-		    loge "  unacceptable primary key validity ($validity)."
+		    log "  unacceptable primary key validity ($validity)."
 		    continue
 		fi
 		# check capability is not Disabled...
 		if check_capability "$capability" 'D' ; then
-		    loge "  key disabled."
+		    log "  key disabled."
 		    continue
 		fi
 		# check overall key capability
 		# must be Encryption and Authentication
 		if ! check_capability "$capability" $requiredPubCapability ; then
-		    loge "  unacceptable primary key capability ($capability)."
+		    log "  unacceptable primary key capability ($capability)."
 		    continue
 		fi
 
@@ -242,7 +236,7 @@ process_user_id() {
     # key cache file
     if [ "$keyOK" -a "$uidOK" -a "${keyIDs[*]}" ] ; then
 	for keyID in ${keyIDs[@]} ; do
-	    loge "  acceptable key/uid found."
+	    log "  acceptable key/uid found."
 
 	    if [ "$MODE" = 'known_hosts' ] ; then
 		# export the key
@@ -298,11 +292,11 @@ process_known_hosts() {
     cacheDir="$2"
 
     # take all the hosts from the known_hosts file (first field),
-    # grep out all the hashed hosts (lines starting with '|')
+    # grep out all the hashed hosts (lines starting with '|')...
     cut -d ' ' -f 1 "$knownHosts" | \
     grep -v '^|.*$' | \
     while IFS=, read -r -a hosts ; do
-	# process each host
+	# ...and process each host
 	for host in ${hosts[*]} ; do
 	    process_host "$host" "$cacheDir"
 	done