diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /readconf.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h index c3de71f3e..fd31bd40f 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.79 2009/06/27 09:35:06 andreas Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.82 2010/02/08 10:50:20 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -88,7 +88,7 @@ typedef struct { | |||
88 | char *user_hostfile2; | 88 | char *user_hostfile2; |
89 | char *preferred_authentications; | 89 | char *preferred_authentications; |
90 | char *bind_address; /* local socket address for connection to sshd */ | 90 | char *bind_address; /* local socket address for connection to sshd */ |
91 | char *smartcard_device; /* Smartcard reader device */ | 91 | char *pkcs11_provider; /* PKCS#11 provider */ |
92 | int verify_host_key_dns; /* Verify host key using DNS */ | 92 | int verify_host_key_dns; /* Verify host key using DNS */ |
93 | 93 | ||
94 | int num_identity_files; /* Number of files for RSA/DSA identities. */ | 94 | int num_identity_files; /* Number of files for RSA/DSA identities. */ |