summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-keyscan.c
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2019-06-06 05:13:13 +0000
committerotto <otto@openbsd.org>2019-06-06 05:13:13 +0000
commiteedc3e89a813e007ee20d011314f613a59bb057c (patch)
tree91f31197e6edab09a4fae8689c84c9320e2be906 /usr.bin/ssh/ssh-keyscan.c
parentConnectX-5 cards work too (diff)
downloadwireguard-openbsd-eedc3e89a813e007ee20d011314f613a59bb057c.tar.xz
wireguard-openbsd-eedc3e89a813e007ee20d011314f613a59bb057c.zip
Replace calls to ssh_malloc_init() by a static init of malloc_options.
Prepares for changes in the way malloc is initialized. ok guenther@ dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
-rw-r--r--usr.bin/ssh/ssh-keyscan.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c
index 9e783b604d0..d21140b326a 100644
--- a/usr.bin/ssh/ssh-keyscan.c
+++ b/usr.bin/ssh/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.126 2019/01/26 22:35:01 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.127 2019/06/06 05:13:13 otto Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -638,7 +638,6 @@ main(int argc, char **argv)
extern int optind;
extern char *optarg;
- ssh_malloc_init(); /* must be called before any mallocs */
TAILQ_INIT(&tq);
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */