diff options
author | Colin Watson <cjwatson@debian.org> | 2016-02-29 12:15:15 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-03-08 11:51:22 +0000 |
commit | 46961f5704f8e86cea3e99253faad55aef4d8f35 (patch) | |
tree | 0dd97fa4fb649a62b4639fe2674380872b1f3e98 /sftp-server-main.c | |
parent | c753fe267efb1b027424fa8706cf0385fc3d14c1 (diff) | |
parent | 85e40e87a75fb80a0bf893ac05a417d6c353537d (diff) |
New upstream release (7.2).
Diffstat (limited to 'sftp-server-main.c')
-rw-r--r-- | sftp-server-main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp-server-main.c b/sftp-server-main.c index 7e644ab89..c6ccd623e 100644 --- a/sftp-server-main.c +++ b/sftp-server-main.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-server-main.c,v 1.4 2009/02/21 19:32:04 tobias Exp $ */ | 1 | /* $OpenBSD: sftp-server-main.c,v 1.5 2016/02/15 09:47:49 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2008 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2008 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -26,6 +26,7 @@ | |||
26 | #include "log.h" | 26 | #include "log.h" |
27 | #include "sftp.h" | 27 | #include "sftp.h" |
28 | #include "misc.h" | 28 | #include "misc.h" |
29 | #include "xmalloc.h" | ||
29 | 30 | ||
30 | void | 31 | void |
31 | cleanup_exit(int i) | 32 | cleanup_exit(int i) |
@@ -38,6 +39,7 @@ main(int argc, char **argv) | |||
38 | { | 39 | { |
39 | struct passwd *user_pw; | 40 | struct passwd *user_pw; |
40 | 41 | ||
42 | ssh_malloc_init(); /* must be called before any mallocs */ | ||
41 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | 43 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
42 | sanitise_stdfd(); | 44 | sanitise_stdfd(); |
43 | 45 | ||