diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-10-29 09:43:00 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-10-29 09:43:00 +0000 |
| commit | 4b17dab0ba7675679933f9f3d4aed1cd28dd0393 (patch) | |
| tree | 49cef8938d7beb10016662d15546fa090865073d /crypto/openssh/auth-options.c | |
| parent | ee21a45f81a0d84007f4e9b4175b9eb4727a96ee (diff) | |
| download | src-test2-4b17dab0ba7675679933f9f3d4aed1cd28dd0393.tar.gz src-test2-4b17dab0ba7675679933f9f3d4aed1cd28dd0393.zip | |
Notes
Diffstat (limited to 'crypto/openssh/auth-options.c')
| -rw-r--r-- | crypto/openssh/auth-options.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/openssh/auth-options.c b/crypto/openssh/auth-options.c index 2787d2948b50..8595fdc147d8 100644 --- a/crypto/openssh/auth-options.c +++ b/crypto/openssh/auth-options.c @@ -10,9 +10,8 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-options.c,v 1.24 2002/05/13 20:44:58 markus Exp $"); +RCSID("$OpenBSD: auth-options.c,v 1.26 2002/07/30 17:03:55 markus Exp $"); -#include "packet.h" #include "xmalloc.h" #include "match.h" #include "log.h" @@ -20,7 +19,6 @@ RCSID("$OpenBSD: auth-options.c,v 1.24 2002/05/13 20:44:58 markus Exp $"); #include "channels.h" #include "auth-options.h" #include "servconf.h" -#include "bufaux.h" #include "misc.h" #include "monitor_wrap.h" #include "auth.h" @@ -135,7 +133,8 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) goto next_option; } cp = "environment=\""; - if (strncasecmp(opts, cp, strlen(cp)) == 0) { + if (options.permit_user_env && + strncasecmp(opts, cp, strlen(cp)) == 0) { char *s; struct envstring *new_envstring; |