summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2009-02-21 19:32:05 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2009-02-21 19:32:05 +0000
commitd94b2eb321046ebf7a9b81e6c8050df1bd09f45f (patch)
treeb13c5a54e3df98b5fb2d54bd67f9b68fab0a8509 /usr.bin/ssh
parente075faf7c1a9f5957b847d3d593556f95ce7264e (diff)
Added missing newlines in error messages.
ok dtucker
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/misc.c7
-rw-r--r--usr.bin/ssh/sftp-server-main.c5
-rw-r--r--usr.bin/ssh/ssh-keygen.c16
3 files changed, 15 insertions, 13 deletions
diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c
index e7ab17c5d42..1edaca26ead 100644
--- a/usr.bin/ssh/misc.c
+++ b/usr.bin/ssh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.70 2009/01/22 10:02:34 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.71 2009/02/21 19:32:04 tobias Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -694,7 +694,8 @@ sanitise_stdfd(void)
int nullfd, dupfd;
if ((nullfd = dupfd = open(_PATH_DEVNULL, O_RDWR)) == -1) {
- fprintf(stderr, "Couldn't open /dev/null: %s", strerror(errno));
+ fprintf(stderr, "Couldn't open /dev/null: %s\n",
+ strerror(errno));
exit(1);
}
while (++dupfd <= 2) {
@@ -702,7 +703,7 @@ sanitise_stdfd(void)
if (fcntl(dupfd, F_GETFL, 0) >= 0)
continue;
if (dup2(nullfd, dupfd) == -1) {
- fprintf(stderr, "dup2: %s", strerror(errno));
+ fprintf(stderr, "dup2: %s\n", strerror(errno));
exit(1);
}
}
diff --git a/usr.bin/ssh/sftp-server-main.c b/usr.bin/ssh/sftp-server-main.c
index 33275cfedc3..d17e834932b 100644
--- a/usr.bin/ssh/sftp-server-main.c
+++ b/usr.bin/ssh/sftp-server-main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server-main.c,v 1.3 2008/03/26 23:44:41 djm Exp $ */
+/* $OpenBSD: sftp-server-main.c,v 1.4 2009/02/21 19:32:04 tobias Exp $ */
/*
* Copyright (c) 2008 Markus Friedl. All rights reserved.
*
@@ -40,7 +40,8 @@ main(int argc, char **argv)
sanitise_stdfd();
if ((user_pw = getpwuid(getuid())) == NULL) {
- fprintf(stderr, "No user found for uid %lu", (u_long)getuid());
+ fprintf(stderr, "No user found for uid %lu\n",
+ (u_long)getuid());
return 1;
}
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index f00923f3d04..e542204b66b 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.172 2008/11/07 00:42:12 stevesk Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.173 2009/02/21 19:32:04 tobias Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -127,7 +127,7 @@ ask_filename(struct passwd *pw, const char *prompt)
name = _PATH_SSH_CLIENT_ID_RSA;
break;
default:
- fprintf(stderr, "bad key type");
+ fprintf(stderr, "bad key type\n");
exit(1);
break;
}
@@ -413,7 +413,7 @@ do_convert_from_ssh2(struct passwd *pw)
PEM_write_RSAPrivateKey(stdout, k->rsa, NULL, NULL, 0, NULL, NULL)) :
key_write(k, stdout);
if (!ok) {
- fprintf(stderr, "key write failed");
+ fprintf(stderr, "key write failed\n");
exit(1);
}
key_free(k);
@@ -1007,11 +1007,11 @@ do_change_comment(struct passwd *pw)
}
f = fdopen(fd, "w");
if (f == NULL) {
- printf("fdopen %s failed", identity_file);
+ printf("fdopen %s failed\n", identity_file);
exit(1);
}
if (!key_write(public, f))
- fprintf(stderr, "write key failed");
+ fprintf(stderr, "write key failed\n");
key_free(public);
fprintf(f, " %s\n", new_comment);
fclose(f);
@@ -1353,7 +1353,7 @@ main(int argc, char **argv)
printf("Generating public/private %s key pair.\n", key_type_name);
private = key_generate(type, bits);
if (private == NULL) {
- fprintf(stderr, "key_generate failed");
+ fprintf(stderr, "key_generate failed\n");
exit(1);
}
public = key_from_private(private);
@@ -1443,11 +1443,11 @@ passphrase_again:
}
f = fdopen(fd, "w");
if (f == NULL) {
- printf("fdopen %s failed", identity_file);
+ printf("fdopen %s failed\n", identity_file);
exit(1);
}
if (!key_write(public, f))
- fprintf(stderr, "write key failed");
+ fprintf(stderr, "write key failed\n");
fprintf(f, " %s\n", comment);
fclose(f);