- 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@

1 files changed, 4 insertions, 1 deletions

diff --git a/sshd.c b/sshd.c
index e9125a229..ceb85dd54 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.312 2005/07/25 11:59:40 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.313 2005/09/13 23:40:07 djm Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -924,6 +924,9 @@ main(int ac, char **av)
         if (geteuid() == 0 && setgroups(0, NULL) == -1)
                 debug("setgroups(): %.200s", strerror(errno));
 
+        /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
+        sanitise_stdfd();
+
         /* Initialize configuration options to their default values. */
         initialize_server_options(&options);