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-agent.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-agent.c')
| -rw-r--r-- | ssh-agent.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index d06ecfd9..034f3138 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.233 2019/01/22 22:58:50 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.234 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 @@ -1096,7 +1096,6 @@ main(int ac, char **av) size_t npfd = 0; u_int maxfds; - 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(); |