diff options
author | Damien Miller <djm@mindrot.org> | 2013-10-15 12:13:05 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-10-15 12:13:05 +1100 |
commit | 194fd904d8597a274b93e075b2047afdf5a175d4 (patch) | |
tree | e8bd17b8455a41b3dc493b2b69933b8ef0cbfff7 /readconf.h | |
parent | 71df752de2a04f423b1cd18d961a79f4fbccbcee (diff) |
- djm@cvs.openbsd.org 2013/10/14 22:22:05
[readconf.c readconf.h ssh-keysign.c ssh.c ssh_config.5]
add a "Match" keyword to ssh_config that allows matching on hostname,
user and result of arbitrary commands. "nice work" markus@
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/readconf.h b/readconf.h index ca4a042ad..cde8b5242 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.96 2013/08/20 00:11:38 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.97 2013/10/14 22:22:03 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -159,12 +159,12 @@ typedef struct { | |||
159 | 159 | ||
160 | void initialize_options(Options *); | 160 | void initialize_options(Options *); |
161 | void fill_default_options(Options *); | 161 | void fill_default_options(Options *); |
162 | int read_config_file(const char *, const char *, Options *, int); | 162 | int process_config_line(Options *, struct passwd *, const char *, char *, |
163 | const char *, int, int *, int); | ||
164 | int read_config_file(const char *, struct passwd *, const char *, | ||
165 | Options *, int); | ||
163 | int parse_forward(Forward *, const char *, int, int); | 166 | int parse_forward(Forward *, const char *, int, int); |
164 | 167 | int default_ssh_port(void); | |
165 | int | ||
166 | process_config_line(Options *, const char *, char *, const char *, int, int *, | ||
167 | int); | ||
168 | 168 | ||
169 | void add_local_forward(Options *, const Forward *); | 169 | void add_local_forward(Options *, const Forward *); |
170 | void add_remote_forward(Options *, const Forward *); | 170 | void add_remote_forward(Options *, const Forward *); |