summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-10 21:43:53 +1000
committerDamien Miller <djm@mindrot.org>2002-09-10 21:43:53 +1000
commite9994cb4d77d36f54af146a9ca0ea4db03b861b6 (patch)
tree2d0fd79e92bd3604239b08ef91078e8772286d69
parent005d4560ed000be8a667f876967348a99a7a8897 (diff)
- (djm) Bug #365: Read /.ssh/environment properly under CygWin.
Patch from Mark Bradshaw <bradshaw@staff.crosswalk.com>
-rw-r--r--ChangeLog6
-rw-r--r--session.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b7af8dd8..f71dacaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
diff --git a/session.c b/session.c
index 566bd900..d017b17f 100644
--- a/session.c
+++ b/session.c
@@ -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) {