From: djm <djm>
Date: Sat, 15 Mar 2008 06:27:58 +0000 (+0000)
Subject:  - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
X-Git-Tag: V_4_9_P1~19
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/fab9144dbc53afb5ad560ef7cf3e0c403db9c562

 - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
   crashes when used with ChrootDirectory
---

diff --git a/ChangeLog b/ChangeLog
index f63a25db..ea5d59a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    empty; report and patch from Peter Stuge
  - (djm) [regress/test-exec.sh] Silence noise from detection of putty
    commands; report from Peter Stuge
+ - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
+   crashes when used with ChrootDirectory
 
 20080314
  - (tim) [regress/sftp-cmds.sh] s/cd/lcd/ in lls test. Reported by
diff --git a/session.c b/session.c
index f5eaa815..92282f92 100644
--- a/session.c
+++ b/session.c
@@ -1328,8 +1328,6 @@ safely_chroot(const char *path, uid_t uid)
 
 	}
 
-	closefrom(STDERR_FILENO + 1);
-
 	if (chdir(path) == -1)
 		fatal("Unable to chdir to chroot path \"%s\": "
 		    "%s", path, strerror(errno));
@@ -1659,6 +1657,8 @@ do_child(Session *s, const char *command)
 #endif
 	}
 
+	closefrom(STDERR_FILENO + 1);
+
 	if (!options.use_login)
 		do_rc_files(s, shell);