summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/sftp-server-main.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2016-03-11 00:15:29 +0000
committerdes <des@FreeBSD.org>2016-03-11 00:15:29 +0000
commitbb6f58c772c321121b8148fe7726de90f90e1dec (patch)
tree755a41a3dcaa10393f1e0d17469bd517b8a0989a /crypto/openssh/sftp-server-main.c
parent0e0b4ac1f05aada737d7d2280ab40c6b06016981 (diff)
parent9169dee5c46ff1d9dfce5c97590347e20a54c84e (diff)
downloadFreeBSD-src-bb6f58c772c321121b8148fe7726de90f90e1dec.zip
FreeBSD-src-bb6f58c772c321121b8148fe7726de90f90e1dec.tar.gz
Upgrade to OpenSSH 7.2p2.
Diffstat (limited to 'crypto/openssh/sftp-server-main.c')
-rw-r--r--crypto/openssh/sftp-server-main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssh/sftp-server-main.c b/crypto/openssh/sftp-server-main.c
index 7e644ab..c6ccd62 100644
--- a/crypto/openssh/sftp-server-main.c
+++ b/crypto/openssh/sftp-server-main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server-main.c,v 1.4 2009/02/21 19:32:04 tobias Exp $ */
+/* $OpenBSD: sftp-server-main.c,v 1.5 2016/02/15 09:47:49 dtucker Exp $ */
/*
* Copyright (c) 2008 Markus Friedl. All rights reserved.
*
@@ -26,6 +26,7 @@
#include "log.h"
#include "sftp.h"
#include "misc.h"
+#include "xmalloc.h"
void
cleanup_exit(int i)
@@ -38,6 +39,7 @@ main(int argc, char **argv)
{
struct passwd *user_pw;
+ ssh_malloc_init(); /* must be called before any mallocs */
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
sanitise_stdfd();
OpenPOWER on IntegriCloud