From 14f24c3252477e136e28b830b778bb4ffcb67b7e Mon Sep 17 00:00:00 2001 From: cphillip Date: Fri, 25 Jul 2003 19:34:24 +0000 Subject: [PATCH] o Revert to premerge session.c. --- openssh/session.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/openssh/session.c b/openssh/session.c index e8527fa..a2b039f 100644 --- 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); } -- 2.45.2