diff options
author | otto@openbsd.org <otto@openbsd.org> | 2019-06-06 05:13:13 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-06-08 00:25:42 +1000 |
commit | 0323d9b619d512f80c57575b810a05791891f657 (patch) | |
tree | 6bde14513c6fe9ff37d069325ee6baac112b6b60 /ssh-keygen.c | |
parent | c586d2d3129265ea64b12960c379d634bccb6535 (diff) |
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-keygen.c')
-rw-r--r-- | ssh-keygen.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index db371090d..010667157 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.330 2019/05/29 08:30:26 lum Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.331 2019/06/06 05:13:13 otto Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2457,7 +2457,6 @@ main(int argc, char **argv) | |||
2457 | extern int optind; | 2457 | extern int optind; |
2458 | extern char *optarg; | 2458 | extern char *optarg; |
2459 | 2459 | ||
2460 | ssh_malloc_init(); /* must be called before any mallocs */ | ||
2461 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | 2460 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
2462 | sanitise_stdfd(); | 2461 | sanitise_stdfd(); |
2463 | 2462 | ||