summaryrefslogtreecommitdiff
path: root/ssh-keysign.c
diff options
context:
space:
mode:
authorotto@openbsd.org <otto@openbsd.org>2019-06-06 05:13:13 +0000
committerDarren Tucker <dtucker@dtucker.net>2019-06-08 00:25:42 +1000
commit0323d9b619d512f80c57575b810a05791891f657 (patch)
tree6bde14513c6fe9ff37d069325ee6baac112b6b60 /ssh-keysign.c
parentc586d2d3129265ea64b12960c379d634bccb6535 (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 '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 @@
1/* $OpenBSD: ssh-keysign.c,v 1.56 2018/11/23 05:08:07 djm Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.57 2019/06/06 05:13:13 otto Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -173,7 +173,6 @@ main(int argc, char **argv)
173 char *host, *fp; 173 char *host, *fp;
174 size_t slen, dlen; 174 size_t slen, dlen;
175 175
176 ssh_malloc_init(); /* must be called before any mallocs */
177 if (pledge("stdio rpath getpw dns id", NULL) != 0) 176 if (pledge("stdio rpath getpw dns id", NULL) != 0)
178 fatal("%s: pledge: %s", __progname, strerror(errno)); 177 fatal("%s: pledge: %s", __progname, strerror(errno));
179 178