diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-08-01 01:28:38 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-08-01 01:28:38 +0000 |
commit | 5d860f02ca352cd8e51fe266cc2e1b5d58704964 (patch) | |
tree | 72fd795930f9ce2773dfd3f61c4d3d46c638c850 /session.c | |
parent | 4b99be899cc47064c13d8beabc32fe5c3a8f94b5 (diff) |
- 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 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.145 2002/07/22 11:03:06 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.146 2002/07/30 17:03:55 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1065,7 +1065,7 @@ do_setup_env(Session *s, const char *shell) | |||
1065 | auth_sock_name); | 1065 | auth_sock_name); |
1066 | 1066 | ||
1067 | /* read $HOME/.ssh/environment. */ | 1067 | /* read $HOME/.ssh/environment. */ |
1068 | if (!options.use_login) { | 1068 | if (options.permit_user_env && !options.use_login) { |
1069 | snprintf(buf, sizeof buf, "%.200s/.ssh/environment", | 1069 | snprintf(buf, sizeof buf, "%.200s/.ssh/environment", |
1070 | pw->pw_dir); | 1070 | pw->pw_dir); |
1071 | read_environment_file(&env, &envsize, buf); | 1071 | read_environment_file(&env, &envsize, buf); |