summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-22 13:11:20 +0200
committerDarren Tucker <dtucker@zip.com.au>2003-09-22 13:11:20 +0200
commit3d326221714451b616b82744d38af484e718b49b (patch)
treeaeba2b902b1d04e41dfef4c9e0929eb1bbbcc013
parent - markus@cvs.openbsd.org 2003/09/19 11:29:40 (diff)
downloadopenssh-3d326221714451b616b82744d38af484e718b49b.tar.xz
openssh-3d326221714451b616b82744d38af484e718b49b.zip
- markus@cvs.openbsd.org 2003/09/19 11:30:39
[ssh-keyscan.c] avoid fatal_cleanup, just call exit(); ok deraadt
-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 @@
- markus@cvs.openbsd.org 2003/09/19 11:29:40
[ssh-agent.c]
provide a ssh-agent specific fatal() function; ok deraadt
+ - markus@cvs.openbsd.org 2003/09/19 11:30:39
+ [ssh-keyscan.c]
+ avoid fatal_cleanup, just call exit(); ok deraadt
20030919
- (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1191,4 +1194,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3031 2003/09/22 11:10:21 dtucker Exp $
+$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 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.44 2003/06/28 16:23:06 deraadt Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.45 2003/09/19 11:30:39 markus Exp $");
#include "openbsd-compat/sys-queue.h"
@@ -675,7 +675,7 @@ fatal(const char *fmt,...)
if (nonfatal_fatal)
longjmp(kexjmp, -1);
else
- fatal_cleanup();
+ exit(255);
}
static void