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 /sftp-server.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 'sftp-server.c')
-rw-r--r-- | sftp-server.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sftp-server.c b/sftp-server.c index 19a132bd9..ee6013e3f 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server.c,v 1.114 2019/01/16 23:22:10 djm Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.115 2019/06/06 05:13:13 otto Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -1574,7 +1574,6 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
1574 | extern char *optarg; | 1574 | extern char *optarg; |
1575 | extern char *__progname; | 1575 | extern char *__progname; |
1576 | 1576 | ||
1577 | ssh_malloc_init(); /* must be called before any mallocs */ | ||
1578 | __progname = ssh_get_progname(argv[0]); | 1577 | __progname = ssh_get_progname(argv[0]); |
1579 | log_init(__progname, log_level, log_facility, log_stderr); | 1578 | log_init(__progname, log_level, log_facility, log_stderr); |
1580 | 1579 | ||