- djm@cvs.openbsd.org 2008/02/13 22:38:17

     [servconf.h session.c sshd.c]
     rekey arc4random and OpenSSL RNG in postauth child
     closefrom fds > 2 before shell/command execution
     ok markus@

1 files changed, 5 insertions, 4 deletions

diff --git a/session.c b/session.c
index 545e27fb7..589a15a6d 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.227 2008/02/10 10:54:29 djm Exp $ */
+/* $OpenBSD: session.c,v 1.228 2008/02/13 22:38:17 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -94,9 +94,6 @@
 #include <kafs.h>
 #endif
 
-/* Magic name for internal sftp-server */
-#define INTERNAL_SFTP_NAME      "internal-sftp"
-
 /* func */
 
 Session *session_new(void);
@@ -491,6 +488,8 @@ do_exec_no_pty(Session *s, const char *command)
                 cray_init_job(s->pw); /* set up cray jid and tmpdir */
 #endif
 
+                closefrom(STDERR_FILENO + 1);
+
                 /* Do processing for the child (exec command etc). */
                 do_child(s, command);
                 /* NOTREACHED */
@@ -611,6 +610,8 @@ do_exec_pty(Session *s, const char *command)
 # endif
 #endif
 
+                closefrom(STDERR_FILENO + 1);
+
                 /* Do common processing for the child, such as execing the command. */
                 do_child(s, command);
                 /* NOTREACHED */