summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-29 21:42:31 +1000
committerDamien Miller <djm@mindrot.org>2011-05-29 21:42:31 +1000
commit295ee63ab2123899fb21f76616ef4dac51515236 (patch)
treeabfdff06f36b5d5cc32296b53e34c8084f342a9a /readconf.h
parent04bb56ef10bca3219010fdb191f1f9941353174b (diff)
- djm@cvs.openbsd.org 2011/05/24 07:15:47
[readconf.c readconf.h ssh.c ssh_config.5 sshconnect.c sshconnect2.c] Remove undocumented legacy options UserKnownHostsFile2 and GlobalKnownHostsFile2 by making UserKnownHostsFile/GlobalKnownHostsFile accept multiple paths per line and making their defaults include known_hosts2; ok markus
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/readconf.h b/readconf.h
index bc3e8c1bb..5944cff93 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.89 2011/05/06 21:34:32 djm Exp $ */ 1/* $OpenBSD: readconf.h,v 1.90 2011/05/24 07:15:47 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -27,7 +27,8 @@ typedef struct {
27} Forward; 27} Forward;
28/* Data structure for representing option data. */ 28/* Data structure for representing option data. */
29 29
30#define MAX_SEND_ENV 256 30#define MAX_SEND_ENV 256
31#define SSH_MAX_HOSTS_FILES 256
31 32
32typedef struct { 33typedef struct {
33 int forward_agent; /* Forward authentication agent. */ 34 int forward_agent; /* Forward authentication agent. */
@@ -83,10 +84,10 @@ typedef struct {
83 char *user; /* User to log in as. */ 84 char *user; /* User to log in as. */
84 int escape_char; /* Escape character; -2 = none */ 85 int escape_char; /* Escape character; -2 = none */
85 86
86 char *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */ 87 u_int num_system_hostfiles; /* Paths for /etc/ssh/ssh_known_hosts */
87 char *user_hostfile; /* Path for $HOME/.ssh/known_hosts. */ 88 char *system_hostfiles[SSH_MAX_HOSTS_FILES];
88 char *system_hostfile2; 89 u_int num_user_hostfiles; /* Path for $HOME/.ssh/known_hosts */
89 char *user_hostfile2; 90 char *user_hostfiles[SSH_MAX_HOSTS_FILES];
90 char *preferred_authentications; 91 char *preferred_authentications;
91 char *bind_address; /* local socket address for connection to sshd */ 92 char *bind_address; /* local socket address for connection to sshd */
92 char *pkcs11_provider; /* PKCS#11 provider */ 93 char *pkcs11_provider; /* PKCS#11 provider */