diff options
| author | des <des@FreeBSD.org> | 2002-10-29 09:43:00 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-10-29 09:43:00 +0000 |
| commit | 099d1a58f7bc088a9f71af6d32542ca3949468a3 (patch) | |
| tree | 49cef8938d7beb10016662d15546fa090865073d /crypto/openssh/auth-options.c | |
| parent | 1ba793a7c09e24d920de3983a3223770cb37ebff (diff) | |
| download | FreeBSD-src-099d1a58f7bc088a9f71af6d32542ca3949468a3.zip FreeBSD-src-099d1a58f7bc088a9f71af6d32542ca3949468a3.tar.gz | |
Vendor import of OpenSSH-portable 3.5p1.
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 2787d29..8595fdc 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; |
