summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authordjm <djm>2008-03-15 06:27:58 +0000
committerdjm <djm>2008-03-15 06:27:58 +0000
commitaabdb7214de40f6e28c761c4e4d3ba428b60c1a5 (patch)
tree8f23b680f76b3e583dc1b5c80edc63f2baa9fabf /session.c
parente9afe7045457e74f9577f5a4d7cf4ff07c969155 (diff)
downloadopenssh-aabdb7214de40f6e28c761c4e4d3ba428b60c1a5.tar.gz
- (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
crashes when used with ChrootDirectory
Diffstat (limited to 'session.c')
-rw-r--r--session.c4
1 files changed, 2 insertions, 2 deletions
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);