X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fshare%2Fcommon;h=cabc378f05729bf29e673ee0499bca55d4911748;hb=dc52882f7ecf895377bfbf65833c6a699be4ab28;hp=e735319800f36930fa26c0d488d59534254f4811;hpb=351bf22e962c7ba6da5ee3d8cec9d77264673c88;p=monkeysphere.git

diff --git a/src/share/common b/src/share/common
index e735319..cabc378 100644
--- a/src/share/common
+++ b/src/share/common
@@ -478,7 +478,7 @@ gpg2ssh() {
     
     keyID="$1"
 
-    gpg --export "$keyID" | openpgp2ssh "$keyID" 2>/dev/null
+    gpg --export --no-armor "$keyID" | openpgp2ssh "$keyID" 2>/dev/null
 }
 
 # output known_hosts line from ssh key
@@ -581,6 +581,10 @@ gpg_fetch_userid() {
 	--search ="$userID" &>/dev/null
     returnCode="$?"
 
+    if [ "$returnCode" != 0 ] ; then
+        log error "Failure ($returnCode) searching keyserver $KEYSERVER for user id '$userID'"
+    fi
+
     return "$returnCode"
 }