summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-13 12:37:08 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-13 12:37:08 -0400
commit220a0fb50691a6cf3db9624275d46a6f730f55c6 (patch)
tree1d9a6567c4886cd45d09eb39c4a887b98591e0a7 /src/common
parent3caa700a0443ab2499da42d32b3ffcd7039fc591 (diff)
fix bugs in ssh key export functions
Diffstat (limited to 'src/common')
-rw-r--r--src/common6
1 files changed, 3 insertions, 3 deletions
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