summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-08 19:04:49 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-08 19:04:49 +1100
commitaaf51d2d5b76c25cc549559a200a802e92b2d8aa (patch)
tree99b11a9084f9addc375f181cc37916030d98ff20
parent909d858d6b86c789003b809a636c2c228d3f30c5 (diff)
- djm@cvs.openbsd.org 2010/01/04 02:25:15
[sftp-server.c] bz#1566 don't unnecessarily dup() in and out fds for sftp-server; ok markus@
-rw-r--r--ChangeLog4
-rw-r--r--sftp-server.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 70e3c15e9..05b99b160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,6 +150,10 @@
150 by quoted filenames, but the UI could still be slightly improved. 150 by quoted filenames, but the UI could still be slightly improved.
151 In particular, it is quite slow for remote completion on large directories. 151 In particular, it is quite slow for remote completion on large directories.
152 bz#200; ok markus@ 152 bz#200; ok markus@
153 - djm@cvs.openbsd.org 2010/01/04 02:25:15
154 [sftp-server.c]
155 bz#1566 don't unnecessarily dup() in and out fds for sftp-server;
156 ok markus@
153 157
15420091226 15820091226
155 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 159 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/sftp-server.c b/sftp-server.c
index 20a601f99..cf4e273f8 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.88 2009/10/17 12:10:39 sobrado Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.89 2010/01/04 02:25:15 djm 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 *
@@ -1397,8 +1397,8 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
1397 logit("session opened for local user %s from [%s]", 1397 logit("session opened for local user %s from [%s]",
1398 pw->pw_name, client_addr); 1398 pw->pw_name, client_addr);
1399 1399
1400 in = dup(STDIN_FILENO); 1400 in = STDIN_FILENO;
1401 out = dup(STDOUT_FILENO); 1401 out = STDOUT_FILENO;
1402 1402
1403#ifdef HAVE_CYGWIN 1403#ifdef HAVE_CYGWIN
1404 setmode(in, O_BINARY); 1404 setmode(in, O_BINARY);