summaryrefslogtreecommitdiffstats
path: root/servconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-06-20 21:53:58 +1000
committerDamien Miller <djm@mindrot.org>2012-06-20 21:53:58 +1000
commitc24da77015900e4e416a9f3ac5f51001abb0fd20 (patch)
tree50fb132941472dc6a4c1cbad695cec091eb96138 /servconf.h
parent36378c64134c9fee2258e0fc8f1cff1bfccdfecd (diff)
- markus@cvs.openbsd.org 2012/06/19 18:25:28
[servconf.c servconf.h sshd_config.5] sshd_config: extend Match to allow AcceptEnv and {Allow,Deny}{Users,Groups} this allows 'Match LocalPort 1022' combined with 'AllowUser bauer' ok djm@ (back in March)
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index 2ffaecdc..c2eeed66 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.101 2012/05/13 01:42:32 dtucker Exp $ */
+/* $OpenBSD: servconf.h,v 1.102 2012/06/19 18:25:28 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -192,6 +192,11 @@ struct connection_info {
M_CP_STROPT(revoked_keys_file); \
M_CP_STROPT(authorized_principals_file); \
M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \
+ M_CP_STRARRAYOPT(allow_users, num_allow_users); \
+ M_CP_STRARRAYOPT(deny_users, num_deny_users); \
+ M_CP_STRARRAYOPT(allow_groups, num_allow_groups); \
+ M_CP_STRARRAYOPT(deny_groups, num_deny_groups); \
+ M_CP_STRARRAYOPT(accept_env, num_accept_env); \
} while (0)
struct connection_info *get_connection_info(int, int);