diff options
| author | mouring <mouring> | 2002-08-01 01:28:38 +0000 |
|---|---|---|
| committer | mouring <mouring> | 2002-08-01 01:28:38 +0000 |
| commit | 9b3d5f6ac4a07defa3881c7489b74debb28ac06f (patch) | |
| tree | 7256a1cc95ecd003612cb00a9ff5a13779cff456 /session.c | |
| parent | 2ba6999053798472e7c49f08e956eade48ea0b34 (diff) | |
| download | openssh-9b3d5f6ac4a07defa3881c7489b74debb28ac06f.tar.gz | |
- markus@cvs.openbsd.org 2002/07/30 17:03:55
[auth-options.c servconf.c servconf.h session.c sshd_config sshd_config.5]
add PermitUserEnvironment (off by default!); from dot@dotat.at;
ok provos, deraadt
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.145 2002/07/22 11:03:06 markus Exp $"); +RCSID("$OpenBSD: session.c,v 1.146 2002/07/30 17:03:55 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -1065,7 +1065,7 @@ do_setup_env(Session *s, const char *shell) auth_sock_name); /* read $HOME/.ssh/environment. */ - if (!options.use_login) { + if (options.permit_user_env && !options.use_login) { snprintf(buf, sizeof buf, "%.200s/.ssh/environment", pw->pw_dir); read_environment_file(&env, &envsize, buf); |