summaryrefslogtreecommitdiff
path: root/sftp.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-02-29 12:15:15 +0000
committerColin Watson <cjwatson@debian.org>2016-03-08 11:51:22 +0000
commit46961f5704f8e86cea3e99253faad55aef4d8f35 (patch)
tree0dd97fa4fb649a62b4639fe2674380872b1f3e98 /sftp.c
parentc753fe267efb1b027424fa8706cf0385fc3d14c1 (diff)
parent85e40e87a75fb80a0bf893ac05a417d6c353537d (diff)
New upstream release (7.2).
Diffstat (limited to 'sftp.c')
-rw-r--r--sftp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sftp.c b/sftp.c
index 788601a8d..2077219fa 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.171 2015/08/20 22:32:42 deraadt Exp $ */ 1/* $OpenBSD: sftp.c,v 1.172 2016/02/15 09:47:49 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -2248,6 +2248,7 @@ main(int argc, char **argv)
2248 size_t num_requests = DEFAULT_NUM_REQUESTS; 2248 size_t num_requests = DEFAULT_NUM_REQUESTS;
2249 long long limit_kbps = 0; 2249 long long limit_kbps = 0;
2250 2250
2251 ssh_malloc_init(); /* must be called before any mallocs */
2251 /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ 2252 /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
2252 sanitise_stdfd(); 2253 sanitise_stdfd();
2253 setlocale(LC_CTYPE, ""); 2254 setlocale(LC_CTYPE, "");