summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2000-12-06 22:47:55 +0000
committerKevin Steves <stevesk@pobox.com>2000-12-06 22:47:55 +0000
commitfc74af43ce005c9220bfb110a2fbf3a48c36c148 (patch)
tree865150714ff93a06587c14ab8705f73e3ce70bc4
parent2c65ada57319d01c5ba2a670e68f8c0167b83823 (diff)
- (stevesk) OpenSSH CVS update:
- markus@cvs.openbsd.org 2000/12/06 19:57:48 [ssh-keyscan.c] err(3) -> internal error(), from stevesk@sweden.hp.com
-rw-r--r--ChangeLog4
-rw-r--r--ssh-keyscan.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d128a197..0d695e04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
tweak comment to reflect real location of pid file; ok provos@
- (stevesk) Import <sys/queue.h> from OpenBSD for systems that don't
have it (used in ssh-keyscan).
+ - (stevesk) OpenSSH CVS update:
+ - markus@cvs.openbsd.org 2000/12/06 19:57:48
+ [ssh-keyscan.c]
+ err(3) -> internal error(), from stevesk@sweden.hp.com
20001205
- (bal) OpenSSH CVS updates:
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 26ea59ec..19f57b7e 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -8,14 +8,13 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.1 2000/12/04 19:24:02 markus Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.2 2000/12/06 19:57:48 markus Exp $");
#ifdef HAVE_SYS_QUEUE_H
#include <sys/queue.h>
#else
#include "bsd-queue.h"
#endif
-#include <err.h>
#include <errno.h>
#include <openssl/bn.h>
@@ -528,7 +527,7 @@ nexthost(int argc, char **argv)
fname = argv[argno++];
if (!strcmp(fname, "-"))
fname = NULL;
- lb = Linebuf_alloc(fname, warn);
+ lb = Linebuf_alloc(fname, error);
} else
error("ignoring invalid/misplaced option `%s'", argv[argno++]);
} else {