diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-06-06 18:23:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-06-07 04:27:20 +1000 |
commit | 93c06ab6b77514e0447fe4f1d822afcbb2a9be08 (patch) | |
tree | 86b19179eaa51962f0dae9ab02d6d37197942265 /servconf.h | |
parent | 115063a6647007286cc8ca70abfd2a7585f26ccc (diff) |
upstream: permitlisten option for authorized_keys; ok markus@
OpenBSD-Commit-ID: 8650883018d7aa893173d703379e4456a222c672
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/servconf.h b/servconf.h index 62acd8938..450b94ec4 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.132 2018/06/06 18:22:41 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.133 2018/06/06 18:23:32 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -183,8 +183,8 @@ typedef struct { | |||
183 | 183 | ||
184 | char **permitted_opens; /* May also be one of PERMITOPEN_* */ | 184 | char **permitted_opens; /* May also be one of PERMITOPEN_* */ |
185 | u_int num_permitted_opens; | 185 | u_int num_permitted_opens; |
186 | char **permitted_remote_opens; /* May also be one of PERMITOPEN_* */ | 186 | char **permitted_listens; /* May also be one of PERMITOPEN_* */ |
187 | u_int num_permitted_remote_opens; | 187 | u_int num_permitted_listens; |
188 | 188 | ||
189 | char *chroot_directory; | 189 | char *chroot_directory; |
190 | char *revoked_keys_file; | 190 | char *revoked_keys_file; |
@@ -248,8 +248,7 @@ struct connection_info { | |||
248 | M_CP_STRARRAYOPT(accept_env, num_accept_env); \ | 248 | M_CP_STRARRAYOPT(accept_env, num_accept_env); \ |
249 | M_CP_STRARRAYOPT(auth_methods, num_auth_methods); \ | 249 | M_CP_STRARRAYOPT(auth_methods, num_auth_methods); \ |
250 | M_CP_STRARRAYOPT(permitted_opens, num_permitted_opens); \ | 250 | M_CP_STRARRAYOPT(permitted_opens, num_permitted_opens); \ |
251 | M_CP_STRARRAYOPT(permitted_remote_opens, \ | 251 | M_CP_STRARRAYOPT(permitted_listens, num_permitted_listens); \ |
252 | num_permitted_remote_opens); \ | ||
253 | } while (0) | 252 | } while (0) |
254 | 253 | ||
255 | struct connection_info *get_connection_info(int, int); | 254 | struct connection_info *get_connection_info(int, int); |