summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--session.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ad61c0938..e943a8301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 empty; report and patch from Peter Stuge 3 empty; report and patch from Peter Stuge
4 - (djm) [regress/test-exec.sh] Silence noise from detection of putty 4 - (djm) [regress/test-exec.sh] Silence noise from detection of putty
5 commands; report from Peter Stuge 5 commands; report from Peter Stuge
6 - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
7 crashes when used with ChrootDirectory
6 8
720080314 920080314
8 - (tim) [regress/sftp-cmds.sh] s/cd/lcd/ in lls test. Reported by 10 - (tim) [regress/sftp-cmds.sh] s/cd/lcd/ in lls test. Reported by
@@ -3763,4 +3765,4 @@
3763 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3765 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3764 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3766 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3765 3767
3766$Id: ChangeLog,v 1.4878 2008/03/14 22:25:54 djm Exp $ 3768$Id: ChangeLog,v 1.4879 2008/03/15 06:27:58 djm Exp $
diff --git a/session.c b/session.c
index f5eaa815c..92282f92a 100644
--- a/session.c
+++ b/session.c
@@ -1328,8 +1328,6 @@ safely_chroot(const char *path, uid_t uid)
1328 1328
1329 } 1329 }
1330 1330
1331 closefrom(STDERR_FILENO + 1);
1332
1333 if (chdir(path) == -1) 1331 if (chdir(path) == -1)
1334 fatal("Unable to chdir to chroot path \"%s\": " 1332 fatal("Unable to chdir to chroot path \"%s\": "
1335 "%s", path, strerror(errno)); 1333 "%s", path, strerror(errno));
@@ -1659,6 +1657,8 @@ do_child(Session *s, const char *command)
1659#endif 1657#endif
1660 } 1658 }
1661 1659
1660 closefrom(STDERR_FILENO + 1);
1661
1662 if (!options.use_login) 1662 if (!options.use_login)
1663 do_rc_files(s, shell); 1663 do_rc_files(s, shell);
1664 1664