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-add.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-add.c')
-rw-r--r-- | ssh-add.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-add.c,v 1.138 2019/01/21 12:53:35 djm Exp $ */ | 1 | /* $OpenBSD: ssh-add.c,v 1.139 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) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -575,7 +575,6 @@ main(int argc, char **argv) | |||
575 | SyslogFacility log_facility = SYSLOG_FACILITY_AUTH; | 575 | SyslogFacility log_facility = SYSLOG_FACILITY_AUTH; |
576 | LogLevel log_level = SYSLOG_LEVEL_INFO; | 576 | LogLevel log_level = SYSLOG_LEVEL_INFO; |
577 | 577 | ||
578 | ssh_malloc_init(); /* must be called before any mallocs */ | ||
579 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | 578 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
580 | sanitise_stdfd(); | 579 | sanitise_stdfd(); |
581 | 580 | ||