summaryrefslogtreecommitdiffstats
path: root/scp.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-10-03 18:11:24 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-10-03 18:11:24 +1000
commitce321d8a30a81222d11a4c27fd353804a9afecd3 (patch)
tree9b43bd892b03286fbbda2f032fe16a0f6cf9bb74 /scp.c
parentd89dbf29ff288ac8ba1755d15f63d2bd58dcb71b (diff)
- djm@cvs.openbsd.org 2005/09/13 23:40:07
[sshd.c ssh.c misc.h sftp.c ssh-keygen.c ssh-keysign.c sftp-server.c scp.c misc.c ssh-keyscan.c ssh-add.c ssh-agent.c] ensure that stdio fds are attached; ok deraadt@
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/scp.c b/scp.c
index 1407aa71..58c00442 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.125 2005/07/27 10:39:03 dtucker Exp $");
+RCSID("$OpenBSD: scp.c,v 1.126 2005/09/13 23:40:07 djm Exp $");
#include "xmalloc.h"
#include "atomicio.h"
@@ -222,6 +222,9 @@ main(int argc, char **argv)
extern char *optarg;
extern int optind;
+ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
+ sanitise_stdfd();
+
__progname = ssh_get_progname(argv[0]);
args.list = NULL;