summaryrefslogtreecommitdiff
path: root/sftp-server.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-08-22 10:59:58 +0100
committerColin Watson <cjwatson@debian.org>2015-08-22 10:59:58 +0100
commit651211fd4a199b299540c00c54a46e27fadb04be (patch)
tree26dbf99c8861a7f94d0c00be71b38869728ebd81 /sftp-server.c
parent58ddb8ad21f21f5358db0204c4ba9abf94a1ca11 (diff)
parente91346dc2bbf460246df2ab591b7613908c1b0ad (diff)
Import openssh_7.1p1.orig.tar.gz
Diffstat (limited to 'sftp-server.c')
-rw-r--r--sftp-server.c6
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) {