diff options
| author |   otto <otto@openbsd.org> | 2019-06-06 05:13:13 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2019-06-06 05:13:13 +0000 |
| commit | eedc3e89a813e007ee20d011314f613a59bb057c (patch) | |
| tree | 91f31197e6edab09a4fae8689c84c9320e2be906 /usr.bin/ssh/ssh.c | |
| parent | ConnectX-5 cards work too (diff) | |
| download | wireguard-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.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 1e773ebaf13..defa3c1c337 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.501 2019/04/23 11:56:41 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.502 2019/06/06 05:13:13 otto Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -580,7 +580,6 @@ main(int ac, char **av) struct ssh_digest_ctx *md; u_char conn_hash[SSH_DIGEST_MAX_LENGTH]; - ssh_malloc_init(); /* must be called before any mallocs */ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); |