summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2018-04-06 04:15:45 +0000
committerdjm <djm@openbsd.org>2018-04-06 04:15:45 +0000
commit32498d77cdb2ed45417c2b3ee37af5b86b6fdad0 (patch)
tree4a82bf9a9acd7d4d17cfc400de65c3e4b14afce3
parentadd a couple of missed options to the config dump; patch from (diff)
downloadwireguard-openbsd-32498d77cdb2ed45417c2b3ee37af5b86b6fdad0.tar.xz
wireguard-openbsd-32498d77cdb2ed45417c2b3ee37af5b86b6fdad0.zip
relax checking of authorized_keys environment="..." options to allow
underscores in variable names (regression introduced in 7.7). bz2851, ok deraadt@
-rw-r--r--usr.bin/ssh/auth-options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth-options.c b/usr.bin/ssh/auth-options.c
index f30826028ef..9818e5c2694 100644
--- a/usr.bin/ssh/auth-options.c
+++ b/usr.bin/ssh/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>
*
@@ -391,7 +391,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;