diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-01-31 22:42:45 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-02-01 10:20:24 +1100 |
| commit | c2bd7f74b0e0f3a3ee9d19ac549e6ba89013abaf (patch) | |
| tree | f90d36f2501a863ff0c3d1041d93a2ef827c54d1 /auth.c | |
| parent | ba261a1dd33266168ead4f8f40446dcece4d1600 (diff) | |
upstream: 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@
OpenBSD-Commit-ID: 36ed0e845b872e33f03355b936a4fff02d5794ff
Diffstat (limited to 'auth.c')
| -rw-r--r-- | auth.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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. * @@ -79,6 +79,7 @@ /* import */ extern ServerOptions options; +extern struct include_list includes; extern int use_privsep; extern struct sshbuf *loginmsg; extern struct passwd *privsep_pw; @@ -571,7 +572,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); |