summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keyscan.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4707332af..73b71dd80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,9 @@
55 - markus@cvs.openbsd.org 2003/09/19 11:29:40 55 - markus@cvs.openbsd.org 2003/09/19 11:29:40
56 [ssh-agent.c] 56 [ssh-agent.c]
57 provide a ssh-agent specific fatal() function; ok deraadt 57 provide a ssh-agent specific fatal() function; ok deraadt
58 - markus@cvs.openbsd.org 2003/09/19 11:30:39
59 [ssh-keyscan.c]
60 avoid fatal_cleanup, just call exit(); ok deraadt
58 61
5920030919 6220030919
60 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; 63 - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1191,4 +1194,4 @@
1191 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1194 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1192 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1195 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1193 1196
1194$Id: ChangeLog,v 1.3031 2003/09/22 11:10:21 dtucker Exp $ 1197$Id: ChangeLog,v 1.3032 2003/09/22 11:11:20 dtucker Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 9fa8aaebc..9506ec196 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.44 2003/06/28 16:23:06 deraadt Exp $"); 10RCSID("$OpenBSD: ssh-keyscan.c,v 1.45 2003/09/19 11:30:39 markus Exp $");
11 11
12#include "openbsd-compat/sys-queue.h" 12#include "openbsd-compat/sys-queue.h"
13 13
@@ -675,7 +675,7 @@ fatal(const char *fmt,...)
675 if (nonfatal_fatal) 675 if (nonfatal_fatal)
676 longjmp(kexjmp, -1); 676 longjmp(kexjmp, -1);
677 else 677 else
678 fatal_cleanup(); 678 exit(255);
679} 679}
680 680
681static void 681static void