diff options
| author | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-03-14 13:05:13 +0000 |
| commit | 0f31b02d696704321e4e94e63dceff52599ab808 (patch) | |
| tree | 953c18ea1e163d5ebd4b0d153b6378646ff41808 /crypto/openssh/sftp-server-main.c | |
| parent | 5080a59fa0c3561940d69fe29dc75ac489f0183a (diff) | |
| download | FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.zip FreeBSD-src-0f31b02d696704321e4e94e63dceff52599ab808.tar.gz | |
MFS (r296781):
MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)
MFH (r296634): re-add aes-cbc to server-side default cipher list
MFH (r296651, r296657): fix gcc build of pam_ssh
PR: 207679
Security: CVE-2016-3115
Approved by: re (marius)
Diffstat (limited to 'crypto/openssh/sftp-server-main.c')
| -rw-r--r-- | crypto/openssh/sftp-server-main.c | 4 |
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(); |
