diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:13:30 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:13:30 +1100 |
commit | 2b3a03ea3f92dce71134b9c2aa90d975dc59bb57 (patch) | |
tree | a234e7fd8cb6dde9f7cece91c437f79d6d42fa6e /readconf.h | |
parent | 2fefe034731c1a08b9a6b4106df200ad0f0d1ba7 (diff) |
- dtucker@cvs.openbsd.org 2013/02/17 23:16:57
[readconf.c ssh.c readconf.h sshconnect2.c]
Keep track of which IndentityFile options were manually supplied and which
were default options, and don't warn if the latter are missing.
ok markus@
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index be30ee0e1..35f596626 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.91 2011/09/23 07:45:05 markus Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.92 2013/02/17 23:16:57 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -96,6 +96,7 @@ typedef struct { | |||
96 | 96 | ||
97 | int num_identity_files; /* Number of files for RSA/DSA identities. */ | 97 | int num_identity_files; /* Number of files for RSA/DSA identities. */ |
98 | char *identity_files[SSH_MAX_IDENTITY_FILES]; | 98 | char *identity_files[SSH_MAX_IDENTITY_FILES]; |
99 | int identity_file_userprovided[SSH_MAX_IDENTITY_FILES]; | ||
99 | Key *identity_keys[SSH_MAX_IDENTITY_FILES]; | 100 | Key *identity_keys[SSH_MAX_IDENTITY_FILES]; |
100 | 101 | ||
101 | /* Local TCP/IP forward requests. */ | 102 | /* Local TCP/IP forward requests. */ |
@@ -158,5 +159,6 @@ process_config_line(Options *, const char *, char *, const char *, int, int *); | |||
158 | 159 | ||
159 | void add_local_forward(Options *, const Forward *); | 160 | void add_local_forward(Options *, const Forward *); |
160 | void add_remote_forward(Options *, const Forward *); | 161 | void add_remote_forward(Options *, const Forward *); |
162 | void add_identity_file(Options *, const char *, const char *, int); | ||
161 | 163 | ||
162 | #endif /* READCONF_H */ | 164 | #endif /* READCONF_H */ |