diff options
| author |   aaron <aaron@openbsd.org> | 1999-09-30 21:45:47 +0000 |
|---|---|---|
| committer | aaron <aaron@openbsd.org> | 1999-09-30 21:45:47 +0000 |
| commit | c9b5ae9c424a5cbd8ba091d718bc9599e2e6f67c (patch) | |
| tree | 79392e2c4309216a3cc45885b1c07e602de9ead9 | |
| parent | I'm such an asshole. (diff) | |
| download | wireguard-openbsd-c9b5ae9c424a5cbd8ba091d718bc9599e2e6f67c.tar.xz wireguard-openbsd-c9b5ae9c424a5cbd8ba091d718bc9599e2e6f67c.zip | |
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); |