diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ssh-keyscan.c | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -8,6 +8,10 @@ | |||
8 | tweak comment to reflect real location of pid file; ok provos@ | 8 | tweak comment to reflect real location of pid file; ok provos@ |
9 | - (stevesk) Import <sys/queue.h> from OpenBSD for systems that don't | 9 | - (stevesk) Import <sys/queue.h> from OpenBSD for systems that don't |
10 | have it (used in ssh-keyscan). | 10 | have it (used in ssh-keyscan). |
11 | - (stevesk) OpenSSH CVS update: | ||
12 | - markus@cvs.openbsd.org 2000/12/06 19:57:48 | ||
13 | [ssh-keyscan.c] | ||
14 | err(3) -> internal error(), from stevesk@sweden.hp.com | ||
11 | 15 | ||
12 | 20001205 | 16 | 20001205 |
13 | - (bal) OpenSSH CVS updates: | 17 | - (bal) OpenSSH CVS updates: |
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 26ea59eca..19f57b7e4 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -8,14 +8,13 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.1 2000/12/04 19:24:02 markus Exp $"); | 11 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.2 2000/12/06 19:57:48 markus Exp $"); |
12 | 12 | ||
13 | #ifdef HAVE_SYS_QUEUE_H | 13 | #ifdef HAVE_SYS_QUEUE_H |
14 | #include <sys/queue.h> | 14 | #include <sys/queue.h> |
15 | #else | 15 | #else |
16 | #include "bsd-queue.h" | 16 | #include "bsd-queue.h" |
17 | #endif | 17 | #endif |
18 | #include <err.h> | ||
19 | #include <errno.h> | 18 | #include <errno.h> |
20 | 19 | ||
21 | #include <openssl/bn.h> | 20 | #include <openssl/bn.h> |
@@ -528,7 +527,7 @@ nexthost(int argc, char **argv) | |||
528 | fname = argv[argno++]; | 527 | fname = argv[argno++]; |
529 | if (!strcmp(fname, "-")) | 528 | if (!strcmp(fname, "-")) |
530 | fname = NULL; | 529 | fname = NULL; |
531 | lb = Linebuf_alloc(fname, warn); | 530 | lb = Linebuf_alloc(fname, error); |
532 | } else | 531 | } else |
533 | error("ignoring invalid/misplaced option `%s'", argv[argno++]); | 532 | error("ignoring invalid/misplaced option `%s'", argv[argno++]); |
534 | } else { | 533 | } else { |