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

   Patch from Mark Bradshaw <bradshaw@staff.crosswalk.com>

diff --git a/ChangeLog b/ChangeLog
index e929e32b6d80a55bc493be244466b3814086eabe..44464f28dcf4728285bb4972ac82d7cc5d7ed6aa 100644 (file)
--- 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

diff --git a/session.c b/session.c
index 566bd900e41004808a7d406115fa8bc7774c8930..d017b17f98af977b28b88c0e31fd57bd927bf15f 100644 (file)
--- 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) {