summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-04-06 04:15:45 +0000
committerDarren Tucker <dtucker@dtucker.net>2018-06-06 16:20:19 +1000
commit484fc023af92ee30bc99eb9798235a00e8f929cc (patch)
tree2d1f9325592cde5943f45f3d4ea0d866b53ca70c
parentae1becf568e8008d1d261cae6b6c0b8d00b53dd2 (diff)
upstream: relax checking of authorized_keys environment="..."V_7_7
options to allow underscores in variable names (regression introduced in 7.7). bz2851, ok deraadt@ OpenBSD-Commit-ID: 69690ffe0c97ff393f2c76d25b4b3d2ed4e4ac9c
-rw-r--r--auth-options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth-options.c b/auth-options.c
index b528c197..ef57ebf4 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.78 2018/03/14 05:35:40 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.79 2018/04/06 04:15:45 djm Exp $ */
/*
* Copyright (c) 2018 Damien Miller <djm@mindrot.org>
*
@@ -394,7 +394,7 @@ sshauthopt_parse(const char *opts, const char **errstrp)
goto fail;
}
for (cp = opt; cp < tmp; cp++) {
- if (!isalnum((u_char)*cp)) {
+ if (!isalnum((u_char)*cp) && *cp != '_') {
free(opt);
errstr = "invalid environment string";
goto fail;