From a1db12bac433cb4caaf12fac18d3ee7cdb78d18c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 22 Jan 2002 23:20:15 +1100 Subject: - markus@cvs.openbsd.org 2002/01/09 13:49:27 [ssh-keygen.c] append \n only for public keys --- ChangeLog | 5 ++++- ssh-keygen.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0df400e9e..84864f78a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,9 @@ - stevesk@cvs.openbsd.org 2002/01/05 21:51:56 [ssh.1 sshd.8] some missing and misplaced periods + - markus@cvs.openbsd.org 2002/01/09 13:49:27 + [ssh-keygen.c] + append \n only for public keys 20020121 @@ -7248,4 +7251,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1751 2002/01/22 12:19:55 djm Exp $ +$Id: ChangeLog,v 1.1752 2002/01/22 12:20:15 djm Exp $ diff --git a/ssh-keygen.c b/ssh-keygen.c index f8c7316dd..07d4cff55 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.89 2001/12/29 21:56:01 stevesk Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.90 2002/01/09 13:49:27 markus Exp $"); #include #include @@ -354,7 +354,8 @@ do_convert_from_ssh2(struct passwd *pw) exit(1); } key_free(k); - fprintf(stdout, "\n"); + if (!private) + fprintf(stdout, "\n"); fclose(fp); exit(0); } -- cgit v1.2.3