summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sftp-server.c
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2019-06-06 05:13:13 +0000
committerotto <otto@openbsd.org>2019-06-06 05:13:13 +0000
commiteedc3e89a813e007ee20d011314f613a59bb057c (patch)
tree91f31197e6edab09a4fae8689c84c9320e2be906 /usr.bin/ssh/sftp-server.c
parentConnectX-5 cards work too (diff)
downloadwireguard-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/sftp-server.c')
-rw-r--r--usr.bin/ssh/sftp-server.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c
index 196526771f7..356b6195d97 100644
--- a/usr.bin/ssh/sftp-server.c
+++ b/usr.bin/ssh/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.114 2019/01/16 23:22:10 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.115 2019/06/06 05:13:13 otto Exp $ */
/*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
*
@@ -1547,7 +1547,6 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
extern char *optarg;
extern char *__progname;
- ssh_malloc_init(); /* must be called before any mallocs */
log_init(__progname, log_level, log_facility, log_stderr);
pw = pwcopy(user_pw);