diff options
| author | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:36:13 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2015-11-29 17:39:41 +0000 |
| commit | 2028ecabc263b3e43903b8d170f4bbd07fe408e9 (patch) | |
| tree | 565242aad1c1d73b6d99f9bf2c62278fca5bdd8c /sftp-server.c | |
| parent | 18a9bd1867ee6fb9d913515773b322a279759b5d (diff) | |
| parent | 733c4de05612fe398ac3dc7d31d318d7012fda05 (diff) | |
New upstream release (7.1p1).
Diffstat (limited to 'sftp-server.c')
| -rw-r--r-- | sftp-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-server.c b/sftp-server.c index d1831bf8d..eac11d7e6 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sftp-server.c,v 1.106 2015/04/24 01:36:01 deraadt Exp $ */ | 1 | /* $OpenBSD: sftp-server.c,v 1.107 2015/08/20 22:32:42 deraadt Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. |
| 4 | * | 4 | * |
| @@ -1632,8 +1632,8 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
| 1632 | fatal("%s: sshbuf_new failed", __func__); | 1632 | fatal("%s: sshbuf_new failed", __func__); |
| 1633 | 1633 | ||
| 1634 | set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask); | 1634 | set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask); |
| 1635 | rset = (fd_set *)xmalloc(set_size); | 1635 | rset = xmalloc(set_size); |
| 1636 | wset = (fd_set *)xmalloc(set_size); | 1636 | wset = xmalloc(set_size); |
| 1637 | 1637 | ||
| 1638 | if (homedir != NULL) { | 1638 | if (homedir != NULL) { |
| 1639 | if (chdir(homedir) != 0) { | 1639 | if (chdir(homedir) != 0) { |