diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:13:08 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:13:08 +1100 |
commit | 1910478c2d2c3d0e1edacaeff21ed388d70759e9 (patch) | |
tree | 49fef766a6d9c3cb93c30194905ed5e3293d9bed /readconf.h | |
parent | c9627cdbc65b25da943f24e6a953da899f08eefc (diff) | |
download | openssh-git-1910478c2d2c3d0e1edacaeff21ed388d70759e9.tar.gz |
- 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
@@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.91 2011/09/23 07:45:05 markus Exp $ */ +/* $OpenBSD: readconf.h,v 1.92 2013/02/17 23:16:57 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -96,6 +96,7 @@ typedef struct { int num_identity_files; /* Number of files for RSA/DSA identities. */ char *identity_files[SSH_MAX_IDENTITY_FILES]; + int identity_file_userprovided[SSH_MAX_IDENTITY_FILES]; Key *identity_keys[SSH_MAX_IDENTITY_FILES]; /* Local TCP/IP forward requests. */ @@ -158,5 +159,6 @@ process_config_line(Options *, const char *, char *, const char *, int, int *); void add_local_forward(Options *, const Forward *); void add_remote_forward(Options *, const Forward *); +void add_identity_file(Options *, const char *, const char *, int); #endif /* READCONF_H */ |