diff options
| author | otto@openbsd.org <otto@openbsd.org> | 2019-06-06 07:13:13 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-06-07 16:25:42 +0200 |
| commit | 0323d9b619d512f80c57575b810a05791891f657 (patch) | |
| tree | 6bde14513c6fe9ff37d069325ee6baac112b6b60 /ssh-keyscan.c | |
| parent | upstream: fix ssh-keysign fd handling problem introduced in r1.304 (diff) | |
| download | openssh-0323d9b619d512f80c57575b810a05791891f657.tar.xz openssh-0323d9b619d512f80c57575b810a05791891f657.zip | |
upstream: 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@
OpenBSD-Commit-ID: 154f4e3e174f614b09f792d4d06575e08de58a6b
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 2ed041559..7b7c0f320 100644 --- a/ssh-keyscan.c +++ b/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>. * @@ -656,7 +656,6 @@ main(int argc, char **argv) extern int optind; extern char *optarg; - ssh_malloc_init(); /* must be called before any mallocs */ __progname = ssh_get_progname(argv[0]); seed_rng(); TAILQ_INIT(&tq); |