Merge commit 'jrollins/master'

2 files changed, 4 insertions, 3 deletions

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 636adcb..d00a9db 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -107,5 +107,6 @@ Written by Jameson Rollins <jrollins@fifthhorseman.net>
 .PD
 .SH SEE ALSO
 .BR ssh (1),
+.BR monkeysphere-ssh-proxycommand (1),
 .BR gpg (1),
 .BR monkeysphere-server (8)
diff --git a/src/common b/src/common
index 914c800..8b0f41a 100644
--- a/src/common
+++ b/src/common
@@ -98,7 +98,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 +109,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