diff options
| author |   djm <djm@openbsd.org> | 2020-01-31 22:42:45 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-01-31 22:42:45 +0000 |
| commit | 20e163162df15c9cd48a73fe80d0d29577e20395 (patch) | |
| tree | dd55ae300601a438a306d0840b3b8c175c82038e /usr.bin/ssh/auth.c | |
| parent | spelling fix; (diff) | |
| download | wireguard-openbsd-20e163162df15c9cd48a73fe80d0d29577e20395.tar.xz wireguard-openbsd-20e163162df15c9cd48a73fe80d0d29577e20395.zip | |
Add a sshd_config "Include" directive to allow inclusion of files.
This has sensible semantics wrt Match blocks and accepts glob(3)
patterns to specify the included files. Based on patch by Jakub
Jelen in bz2468; feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/auth.c')
| -rw-r--r-- | usr.bin/ssh/auth.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index 18bbfc8e275..3e567498c0f 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.145 2020/01/23 07:10:22 dtucker Exp $ */ +/* $OpenBSD: auth.c,v 1.146 2020/01/31 22:42:45 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -67,6 +67,7 @@ /* import */ extern ServerOptions options; +extern struct include_list includes; extern int use_privsep; extern struct sshauthopt *auth_opts; @@ -477,7 +478,7 @@ getpwnamallow(struct ssh *ssh, const char *user) ci = get_connection_info(ssh, 1, options.use_dns); ci->user = user; - parse_server_match_config(&options, ci); + parse_server_match_config(&options, &includes, ci); log_change_level(options.log_level); process_permitopen(ssh, &options); |