summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-10-29 03:13:06 +0000
committerDamien Miller <djm@mindrot.org>2020-10-29 14:15:35 +1100
commit95d1109fec7e89ad21f2a97e92bde1305d32a353 (patch)
tree1390c1d7dee98fa86e2390de36f91dbf6f931fe3
parentb12b835dc022ba161afe68348e05a83dfbcb1515 (diff)
upstream: fix sshd_config SetEnv directive inside Match blocks; part ofHEADmaster
github PR#201 from github user manuelm OpenBSD-Commit-ID: 9772e3748abff3ad65ae8fc43d026ed569b1d2bc
-rw-r--r--servconf.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 7005aea9..a0efe20f 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.147 2020/10/16 13:26:13 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.148 2020/10/29 03:13:06 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -279,6 +279,7 @@ TAILQ_HEAD(include_list, include_item);
M_CP_STRARRAYOPT(allow_groups, num_allow_groups); \
M_CP_STRARRAYOPT(deny_groups, num_deny_groups); \
M_CP_STRARRAYOPT(accept_env, num_accept_env); \
+ M_CP_STRARRAYOPT(setenv, num_setenv); \
M_CP_STRARRAYOPT(auth_methods, num_auth_methods); \
M_CP_STRARRAYOPT(permitted_opens, num_permitted_opens); \
M_CP_STRARRAYOPT(permitted_listens, num_permitted_listens); \