diff options
author | Damien Miller <djm@mindrot.org> | 2002-09-10 21:43:53 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-09-10 21:43:53 +1000 |
commit | e9994cb4d77d36f54af146a9ca0ea4db03b861b6 (patch) | |
tree | 2d0fd79e92bd3604239b08ef91078e8772286d69 | |
parent | 005d4560ed000be8a667f876967348a99a7a8897 (diff) |
- (djm) Bug #365: Read /.ssh/environment properly under CygWin.
Patch from Mark Bradshaw <bradshaw@staff.crosswalk.com>
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | session.c | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20020910 | ||
2 | - (djm) Bug #365: Read /.ssh/environment properly under CygWin. | ||
3 | Patch from Mark Bradshaw <bradshaw@staff.crosswalk.com> | ||
4 | |||
1 | 20020905 | 5 | 20020905 |
2 | - (djm) OpenBSD CVS Sync | 6 | - (djm) OpenBSD CVS Sync |
3 | - stevesk@cvs.openbsd.org 2002/09/04 18:52:42 | 7 | - stevesk@cvs.openbsd.org 2002/09/04 18:52:42 |
@@ -1608,4 +1612,4 @@ | |||
1608 | - (stevesk) entropy.c: typo in debug message | 1612 | - (stevesk) entropy.c: typo in debug message |
1609 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1613 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1610 | 1614 | ||
1611 | $Id: ChangeLog,v 1.2448 2002/09/05 06:53:20 djm Exp $ | 1615 | $Id: ChangeLog,v 1.2449 2002/09/10 11:43:53 djm Exp $ |
@@ -1067,7 +1067,7 @@ do_setup_env(Session *s, const char *shell) | |||
1067 | /* read $HOME/.ssh/environment. */ | 1067 | /* read $HOME/.ssh/environment. */ |
1068 | if (options.permit_user_env && !options.use_login) { | 1068 | if (options.permit_user_env && !options.use_login) { |
1069 | snprintf(buf, sizeof buf, "%.200s/.ssh/environment", | 1069 | snprintf(buf, sizeof buf, "%.200s/.ssh/environment", |
1070 | pw->pw_dir); | 1070 | strcmp(pw->pw_dir, "/") ? pw->pw_dir : ""); |
1071 | read_environment_file(&env, &envsize, buf); | 1071 | read_environment_file(&env, &envsize, buf); |
1072 | } | 1072 | } |
1073 | if (debug_flag) { | 1073 | if (debug_flag) { |