summaryrefslogtreecommitdiffstats
path: root/ssh-keysign.c
diff options
context:
space:
mode:
authorotto@openbsd.org <otto@openbsd.org>2019-06-06 07:13:13 +0200
committerDarren Tucker <dtucker@dtucker.net>2019-06-07 16:25:42 +0200
commit0323d9b619d512f80c57575b810a05791891f657 (patch)
tree6bde14513c6fe9ff37d069325ee6baac112b6b60 /ssh-keysign.c
parentupstream: fix ssh-keysign fd handling problem introduced in r1.304 (diff)
downloadopenssh-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 'ssh-keysign.c')
-rw-r--r--ssh-keysign.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 601f6ca72..9ebc67860 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keysign.c,v 1.56 2018/11/23 05:08:07 djm Exp $ */
+/* $OpenBSD: ssh-keysign.c,v 1.57 2019/06/06 05:13:13 otto Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -173,7 +173,6 @@ main(int argc, char **argv)
char *host, *fp;
size_t slen, dlen;
- ssh_malloc_init(); /* must be called before any mallocs */
if (pledge("stdio rpath getpw dns id", NULL) != 0)
fatal("%s: pledge: %s", __progname, strerror(errno));