diff options
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/auth-options.c b/auth-options.c index 2787d2948..8595fdc14 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -10,9 +10,8 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth-options.c,v 1.24 2002/05/13 20:44:58 markus Exp $"); | 13 | RCSID("$OpenBSD: auth-options.c,v 1.26 2002/07/30 17:03:55 markus Exp $"); |
14 | 14 | ||
15 | #include "packet.h" | ||
16 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
17 | #include "match.h" | 16 | #include "match.h" |
18 | #include "log.h" | 17 | #include "log.h" |
@@ -20,7 +19,6 @@ RCSID("$OpenBSD: auth-options.c,v 1.24 2002/05/13 20:44:58 markus Exp $"); | |||
20 | #include "channels.h" | 19 | #include "channels.h" |
21 | #include "auth-options.h" | 20 | #include "auth-options.h" |
22 | #include "servconf.h" | 21 | #include "servconf.h" |
23 | #include "bufaux.h" | ||
24 | #include "misc.h" | 22 | #include "misc.h" |
25 | #include "monitor_wrap.h" | 23 | #include "monitor_wrap.h" |
26 | #include "auth.h" | 24 | #include "auth.h" |
@@ -135,7 +133,8 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
135 | goto next_option; | 133 | goto next_option; |
136 | } | 134 | } |
137 | cp = "environment=\""; | 135 | cp = "environment=\""; |
138 | if (strncasecmp(opts, cp, strlen(cp)) == 0) { | 136 | if (options.permit_user_env && |
137 | strncasecmp(opts, cp, strlen(cp)) == 0) { | ||
139 | char *s; | 138 | char *s; |
140 | struct envstring *new_envstring; | 139 | struct envstring *new_envstring; |
141 | 140 | ||