summaryrefslogtreecommitdiff
path: root/ssh-keyscan.c
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2000-12-15 18:39:12 +0000
committerKevin Steves <stevesk@pobox.com>2000-12-15 18:39:12 +0000
commitfa72ddac73e3549cf5d399fae31bfb5a293ed0cc (patch)
tree9fc0dd554a432c2ea7151e95482f5fd81175995a /ssh-keyscan.c
parentde41bc6caaa986f6e65629f5e926ea5ce140d8e7 (diff)
- (stevesk) OpenBSD CVS updates:
- markus@cvs.openbsd.org 2000/12/13 16:26:53 [ssh-keyscan.c] fatal already adds \n; from stevesk@pobox.com - markus@cvs.openbsd.org 2000/12/13 16:25:44 [ssh-agent.c] remove redundant spaces; from stevesk@pobox.com - ho@cvs.openbsd.org 2000/12/12 15:50:21 [pty.c] When failing to set tty owner and mode on a read-only filesystem, don't abort if the tty already has correct owner and reasonably sane modes. Example; permit 'root' to login to a firewall with read-only root fs. (markus@ ok) - deraadt@cvs.openbsd.org 2000/12/13 06:36:05 [pty.c] KNF
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r--ssh-keyscan.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 13f9673b..60341c9e 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -329,9 +329,9 @@ conalloc(char *iname, char *oname)
} while ((s = tcpconnect(name)) < 0);
if (s >= maxfd)
- fatal("conalloc: fdno %d too high\n", s);
+ fatal("conalloc: fdno %d too high", s);
if (fdcon[s].c_status)
- fatal("conalloc: attempt to reuse fdno %d\n", s);
+ fatal("conalloc: attempt to reuse fdno %d", s);
fdcon[s].c_fd = s;
fdcon[s].c_status = CS_CON;
@@ -355,7 +355,7 @@ confree(int s)
{
close(s);
if (s >= maxfd || fdcon[s].c_status == CS_UNUSED)
- fatal("confree: attempt to free bad fdno %d\n", s);
+ fatal("confree: attempt to free bad fdno %d", s);
free(fdcon[s].c_namebase);
free(fdcon[s].c_output_name);
if (fdcon[s].c_status == CS_KEYS)
@@ -455,7 +455,7 @@ conread(int s)
return;
break;
default:
- fatal("conread: invalid status %d\n", c->c_status);
+ fatal("conread: invalid status %d", c->c_status);
break;
}
@@ -548,7 +548,7 @@ nexthost(int argc, char **argv)
static void
usage(void)
{
- fatal("usage: %s [-t timeout] { [--] host | -f file } ...\n", __progname);
+ fatal("usage: %s [-t timeout] { [--] host | -f file } ...", __progname);
return;
}
@@ -580,11 +580,11 @@ main(int argc, char **argv)
maxfd = fdlim_get(1);
if (maxfd < 0)
- fatal("%s: fdlim_get: bad value\n", __progname);
+ fatal("%s: fdlim_get: bad value", __progname);
if (maxfd > MAXMAXFD)
maxfd = MAXMAXFD;
if (maxcon <= 0)
- fatal("%s: not enough file descriptors\n", __progname);
+ fatal("%s: not enough file descriptors", __progname);
if (maxfd > fdlim_get(0))
fdlim_set(maxfd);
fdcon = xmalloc(maxfd * sizeof(con));