summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keyscan.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f6ec3bd1c..1cbe63d1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - deraadt@cvs.openbsd.org 2001/11/14 20:45:08 3 - deraadt@cvs.openbsd.org 2001/11/14 20:45:08
4 [sshd.c] 4 [sshd.c]
5 errno saving wrapping in a signal handler 5 errno saving wrapping in a signal handler
6 - markus@cvs.openbsd.org 2001/11/16 12:46:13
7 [ssh-keyscan.c]
8 handle empty lines instead of dumping core; report from sha@sha-1.net
6 9
720011126 1020011126
8 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, 11 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
@@ -6925,4 +6928,4 @@
6925 - Wrote replacements for strlcpy and mkdtemp 6928 - Wrote replacements for strlcpy and mkdtemp
6926 - Released 1.0pre1 6929 - Released 1.0pre1
6927 6930
6928$Id: ChangeLog,v 1.1667 2001/12/06 16:19:01 mouring Exp $ 6931$Id: ChangeLog,v 1.1668 2001/12/06 16:28:19 mouring Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 3fbe88d56..62204102b 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
7 */ 7 */
8 8
9#include "includes.h" 9#include "includes.h"
10RCSID("$OpenBSD: ssh-keyscan.c,v 1.30 2001/10/08 19:05:05 markus Exp $"); 10RCSID("$OpenBSD: ssh-keyscan.c,v 1.31 2001/11/16 12:46:13 markus Exp $");
11 11
12#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) 12#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
13#include <sys/queue.h> 13#include <sys/queue.h>
@@ -647,6 +647,8 @@ do_host(char *host)
647 char *name = strnnsep(&host, " \t\n"); 647 char *name = strnnsep(&host, " \t\n");
648 int j; 648 int j;
649 649
650 if (name == NULL)
651 return;
650 for (j = KT_RSA1; j <= KT_RSA; j *= 2) { 652 for (j = KT_RSA1; j <= KT_RSA; j *= 2) {
651 if (get_keytypes & j) { 653 if (get_keytypes & j) {
652 while (ncon >= MAXCON) 654 while (ncon >= MAXCON)