- (djm) Bug #365: Read /.ssh/environment properly under CygWin.

Patch from Mark Bradshaw <bradshaw@staff.crosswalk.com>
This commit is contained in:
Damien Miller 2002-09-10 21:43:53 +10:00
parent 005d4560ed
commit e9994cb4d7
2 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
20020910
- (djm) Bug #365: Read /.ssh/environment properly under CygWin.
Patch from Mark Bradshaw <bradshaw@staff.crosswalk.com>
20020905
- (djm) OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2002/09/04 18:52:42
@ -1608,4 +1612,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2448 2002/09/05 06:53:20 djm Exp $
$Id: ChangeLog,v 1.2449 2002/09/10 11:43:53 djm Exp $

View File

@ -1067,7 +1067,7 @@ do_setup_env(Session *s, const char *shell)
/* read $HOME/.ssh/environment. */
if (options.permit_user_env && !options.use_login) {
snprintf(buf, sizeof buf, "%.200s/.ssh/environment",
pw->pw_dir);
strcmp(pw->pw_dir, "/") ? pw->pw_dir : "");
read_environment_file(&env, &envsize, buf);
}
if (debug_flag) {