diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2006-07-12 11:34:59 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2006-07-12 11:34:59 +0000 |
| commit | fdc3dd0521f627fedd1d31d115ed5ccb66de19ee (patch) | |
| tree | e81b4747bc263ba5daacf2392c5c78c9a9650a51 /usr.bin/ssh/servconf.h | |
| parent | 09701e4edaafcfd2c1a83c31bf12d0815041c8b5 (diff) | |
Add support for conditional directives to sshd_config via a "Match" keyword,
which works similarly to the "Host" directive in ssh_config.
Lines after a Match line override the default set in the main section
if the condition on the Match line is true, eg
AllowTcpForwarding yes
Match User anoncvs
AllowTcpForwarding no
will allow port forwarding by all users except "anoncvs".
Currently only a very small subset of directives are supported.
ok djm@
Diffstat (limited to 'usr.bin/ssh/servconf.h')
| -rw-r--r-- | usr.bin/ssh/servconf.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/ssh/servconf.h b/usr.bin/ssh/servconf.h index 5152e936c7f..233790d29c5 100644 --- a/usr.bin/ssh/servconf.h +++ b/usr.bin/ssh/servconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.74 2006/07/06 10:47:05 djm Exp $ */ +/* $OpenBSD: servconf.h,v 1.75 2006/07/12 11:34:58 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -140,8 +140,13 @@ typedef struct { void initialize_server_options(ServerOptions *); void fill_default_server_options(ServerOptions *); -int process_server_config_line(ServerOptions *, char *, const char *, int); +int process_server_config_line(ServerOptions *, char *, const char *, int, + int *, const char *, const char *, const char *); void load_server_config(const char *, Buffer *); -void parse_server_config(ServerOptions *, const char *, Buffer *); +void parse_server_config(ServerOptions *, const char *, Buffer *, + const char *, const char *, const char *); +void parse_server_match_config(ServerOptions *, const char *, const char *, + const char *); +void copy_set_server_options(ServerOptions *, ServerOptions *); #endif /* SERVCONF_H */ |