o Revert to premerge session.c.

diff --git a/openssh/session.c b/openssh/session.c
index e8527fadb4f2a13785a0c9da19783c004e44d999..a2b039fa21f9d54b683b1f222d5bb2d30144c161 100644 (file)
--- a/openssh/session.c
+++ b/openssh/session.c
@@ -1168,9 +1168,6 @@ do_setup_env(Session *s, const char *shell)
 #  else 
                child_set_env(&env, &envsize, "PATH", _PATH_STDPATH_WITH_SCP);
 #  endif /* SUPERUSER_PATH */
-               if (getenv("LD_LIBRARY_PATH"))
-                       child_set_env(&env, &envsize, "LD_LIBRARY_PATH",
-                                     getenv("LD_LIBRARY_PATH"));
 # endif /* HAVE_CYGWIN */
 #endif /* HAVE_LOGIN_CAP */
 
@@ -1681,7 +1678,7 @@ do_child(Session *s, const char *command)
                /* Execute the shell. */
                argv[0] = argv0;
                argv[1] = NULL;
-               execve(shell, argv, environ);
+               execve(shell, argv, env);
 
                /* Executing the shell failed. */
                perror(shell);
@@ -1695,7 +1692,7 @@ do_child(Session *s, const char *command)
        argv[1] = "-c";
        argv[2] = (char *) command;
        argv[3] = NULL;
-       execve(shell, argv, environ);
+       execve(shell, argv, env);
        perror(shell);
        exit(1);
 }