summaryrefslogtreecommitdiffstats
path: root/auth-options.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-08-01 01:28:38 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-08-01 01:28:38 +0000
commit5d860f02ca352cd8e51fe266cc2e1b5d58704964 (patch)
tree72fd795930f9ce2773dfd3f61c4d3d46c638c850 /auth-options.c
parent4b99be899cc47064c13d8beabc32fe5c3a8f94b5 (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 'auth-options.c')
-rw-r--r--auth-options.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/auth-options.c b/auth-options.c
index 41a29f79..8595fdc1 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -10,7 +10,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.25 2002/07/21 18:32:20 stevesk Exp $");
+RCSID("$OpenBSD: auth-options.c,v 1.26 2002/07/30 17:03:55 markus Exp $");
#include "xmalloc.h"
#include "match.h"
@@ -133,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;