diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:18:57 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:18:57 +1100 |
commit | 81a05803d6cbf8bd5315d2cb18bcc32bb0869dd6 (patch) | |
tree | 185d96ff7f8d799b8591485233f49139342e43e6 /readconf.h | |
parent | 6628dba7dddd251cbc40ba733415ff824ce96c28 (diff) |
- dtucker@cvs.openbsd.org 2013/02/22 04:45:09
[ssh.c readconf.c readconf.h]
Don't complain if IdentityFiles specified in system-wide configs are
missing. ok djm, deraadt
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h index 35f596626..841648906 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.92 2013/02/17 23:16:57 dtucker Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.93 2013/02/22 04:45:09 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -149,13 +149,17 @@ typedef struct { | |||
149 | #define REQUEST_TTY_YES 2 | 149 | #define REQUEST_TTY_YES 2 |
150 | #define REQUEST_TTY_FORCE 3 | 150 | #define REQUEST_TTY_FORCE 3 |
151 | 151 | ||
152 | #define SSHCONF_CHECKPERM 1 /* check permissions on config file */ | ||
153 | #define SSHCONF_USERCONF 2 /* user provided config file not system */ | ||
154 | |||
152 | void initialize_options(Options *); | 155 | void initialize_options(Options *); |
153 | void fill_default_options(Options *); | 156 | void fill_default_options(Options *); |
154 | int read_config_file(const char *, const char *, Options *, int); | 157 | int read_config_file(const char *, const char *, Options *, int); |
155 | int parse_forward(Forward *, const char *, int, int); | 158 | int parse_forward(Forward *, const char *, int, int); |
156 | 159 | ||
157 | int | 160 | int |
158 | process_config_line(Options *, const char *, char *, const char *, int, int *); | 161 | process_config_line(Options *, const char *, char *, const char *, int, int *, |
162 | int); | ||
159 | 163 | ||
160 | void add_local_forward(Options *, const Forward *); | 164 | void add_local_forward(Options *, const Forward *); |
161 | void add_remote_forward(Options *, const Forward *); | 165 | void add_remote_forward(Options *, const Forward *); |