diff options
| author | des <des@FreeBSD.org> | 2013-04-02 11:44:55 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-04-02 11:44:55 +0000 |
| commit | f1c9eb38e7f5d932f6f246353a1f646f551ffa55 (patch) | |
| tree | c0624291b85cc0b3f2926f679e578a6b59ebcd50 /crypto/openssh/readconf.h | |
| parent | 3325697f0c9f5298d7313d56bd4bb35e4fb47589 (diff) | |
| download | FreeBSD-src-f1c9eb38e7f5d932f6f246353a1f646f551ffa55.zip FreeBSD-src-f1c9eb38e7f5d932f6f246353a1f646f551ffa55.tar.gz | |
Merge upstream patch to silence spurious "no such identity file" warnings.
Diffstat (limited to 'crypto/openssh/readconf.h')
| -rw-r--r-- | crypto/openssh/readconf.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssh/readconf.h b/crypto/openssh/readconf.h index 7f76688..6641e5d 100644 --- a/crypto/openssh/readconf.h +++ b/crypto/openssh/readconf.h @@ -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 $ */ /* $FreeBSD$ */ /* @@ -97,6 +97,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. */ @@ -172,5 +173,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 */ |
