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 /sftp-server-main.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 'sftp-server-main.c')
| -rw-r--r-- | sftp-server-main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sftp-server-main.c b/sftp-server-main.c index 6230d897d..06566d36e 100644 --- a/sftp-server-main.c +++ b/sftp-server-main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server-main.c,v 1.5 2016/02/15 09:47:49 dtucker Exp $ */ +/* $OpenBSD: sftp-server-main.c,v 1.6 2019/06/06 05:13:13 otto Exp $ */ /* * Copyright (c) 2008 Markus Friedl. All rights reserved. * @@ -39,7 +39,6 @@ main(int argc, char **argv) { struct passwd *user_pw; - 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(); |