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

1 files changed, 1 insertions, 3 deletions

diff --git a/sshd.c b/sshd.c
index 1fcde502b..be23fbc80 100644
--- a/sshd.c
+++ b/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
@@ -1433,8 +1433,6 @@ main(int ac, char **av)
         Authctxt *authctxt;
         struct connection_info *connection_info = NULL;
 
-        ssh_malloc_init();      /* must be called before any mallocs */
-
 #ifdef HAVE_SECUREWARE
         (void)set_auth_parameters(ac, av);
 #endif