From ed280485f20fc3d092202cd07bc0c9cd9665cd89 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 22 Jul 2008 23:22:56 -0400 Subject: [PATCH] fixing return code error in openpgp2ssh, preparing for new release. --- debian/changelog | 9 +++++---- src/keytrans/openpgp2ssh.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22f698b..1711a69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -monkeysphere (0.4-1) UNRELEASED; urgency=low +monkeysphere (0.4-1) experimental; urgency=low - [Daniel Kahn Gillmor] - * New version (switch UNRELEASED to experimental when ready) + [ Daniel Kahn Gillmor ] + * New version. + * Fixed return code error in openpgp2ssh [ Jameson Graef Rollins ] * Privilege separation: use monkeysphere user to handle maintenance of @@ -14,7 +15,7 @@ monkeysphere (0.4-1) UNRELEASED; urgency=low * Add write permission check on authorized_keys, known_hosts, and authorized_user_ids files. - -- Jameson Graef Rollins Thu, 10 Jul 2008 16:47:17 -0400 + -- Daniel Kahn Gillmor Tue, 22 Jul 2008 21:50:17 -0400 monkeysphere (0.3-1) experimental; urgency=low diff --git a/src/keytrans/openpgp2ssh.c b/src/keytrans/openpgp2ssh.c index 5cc6cfa..36fb30a 100644 --- a/src/keytrans/openpgp2ssh.c +++ b/src/keytrans/openpgp2ssh.c @@ -491,6 +491,8 @@ int main(int argc, char* argv[]) { err(0,"Translating public key\n"); ret = emit_public_openssh_from_pgp(&pgp_crt, fingerprint, fpr_size); + if (ret != 0) + return ret; } else { /* we have no idea what kind of key this is at all anyway! */ -- 2.25.1