diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 1999-09-30 21:45:48 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 1999-09-30 21:45:48 +0000 |
| commit | 7a121fd137231c43a1e0c83c99dea90ce12b174f (patch) | |
| tree | 64819c4347d2f7879f88327b8b04edb5128a3427 | |
| parent | b51e6bba4ff999146f70ee82aabdc199f10c4b16 (diff) | |
We don't have an /etc/environment.
| -rw-r--r-- | usr.bin/ssh/sshd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index e342f80c187..4a455ba5513 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -18,7 +18,7 @@ agent connections. */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.14 1999/09/30 08:34:25 deraadt Exp $"); +RCSID("$Id: sshd.c,v 1.15 1999/09/30 21:45:47 aaron Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -2057,10 +2057,6 @@ void do_child(const char *command, struct passwd *pw, const char *term, child_set_env(&env, &envsize, SSH_AUTHFD_ENV_NAME, buf); } - /* Read environment variable settings from /etc/environment. (This exists - at least on AIX, but could be useful also elsewhere.) */ - read_environment_file(&env, &envsize, "/etc/environment"); - /* Read $HOME/.ssh/environment. */ snprintf(buf, sizeof buf, "%.200s/.ssh/environment", pw->pw_dir); read_environment_file(&env, &envsize, buf); |