summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd.c
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2019-06-06 05:13:14 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2019-06-06 05:13:14 +0000
commit00f07a093593abbca118e9e541002e930889a208 (patch)
treea29b87d969459ce8bc6cd0927242f5487639f994 /usr.bin/ssh/sshd.c
parentdd19482d831375dc2767fb3d8216df0c8f5dd0e0 (diff)
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/sshd.c')
-rw-r--r--usr.bin/ssh/sshd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 7c8b9c02887..974c998b5bd 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.534 2019/04/18 18:56:16 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.535 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
@@ -1344,7 +1344,6 @@ main(int ac, char **av)
Authctxt *authctxt;
struct connection_info *connection_info = NULL;
- ssh_malloc_init(); /* must be called before any mallocs */
/* Save argv. */
saved_argv = av;
rexec_argc = ac;