diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /readconf.h | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/readconf.h b/readconf.h index 3e5435576..617686f4c 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.88 2010/11/13 23:27:50 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 | ||
32 | typedef struct { | 33 | typedef struct { |
33 | int forward_agent; /* Forward authentication agent. */ | 34 | int forward_agent; /* Forward authentication agent. */ |
@@ -88,10 +89,10 @@ typedef struct { | |||
88 | char *user; /* User to log in as. */ | 89 | char *user; /* User to log in as. */ |
89 | int escape_char; /* Escape character; -2 = none */ | 90 | int escape_char; /* Escape character; -2 = none */ |
90 | 91 | ||
91 | char *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */ | 92 | u_int num_system_hostfiles; /* Paths for /etc/ssh/ssh_known_hosts */ |
92 | char *user_hostfile; /* Path for $HOME/.ssh/known_hosts. */ | 93 | char *system_hostfiles[SSH_MAX_HOSTS_FILES]; |
93 | char *system_hostfile2; | 94 | u_int num_user_hostfiles; /* Path for $HOME/.ssh/known_hosts */ |
94 | char *user_hostfile2; | 95 | char *user_hostfiles[SSH_MAX_HOSTS_FILES]; |
95 | char *preferred_authentications; | 96 | char *preferred_authentications; |
96 | char *bind_address; /* local socket address for connection to sshd */ | 97 | char *bind_address; /* local socket address for connection to sshd */ |
97 | char *pkcs11_provider; /* PKCS#11 provider */ | 98 | char *pkcs11_provider; /* PKCS#11 provider */ |
@@ -137,6 +138,7 @@ typedef struct { | |||
137 | 138 | ||
138 | int use_roaming; | 139 | int use_roaming; |
139 | 140 | ||
141 | int request_tty; | ||
140 | } Options; | 142 | } Options; |
141 | 143 | ||
142 | #define SSHCTL_MASTER_NO 0 | 144 | #define SSHCTL_MASTER_NO 0 |
@@ -145,6 +147,11 @@ typedef struct { | |||
145 | #define SSHCTL_MASTER_ASK 3 | 147 | #define SSHCTL_MASTER_ASK 3 |
146 | #define SSHCTL_MASTER_AUTO_ASK 4 | 148 | #define SSHCTL_MASTER_AUTO_ASK 4 |
147 | 149 | ||
150 | #define REQUEST_TTY_AUTO 0 | ||
151 | #define REQUEST_TTY_NO 1 | ||
152 | #define REQUEST_TTY_YES 2 | ||
153 | #define REQUEST_TTY_FORCE 3 | ||
154 | |||
148 | void initialize_options(Options *); | 155 | void initialize_options(Options *); |
149 | void fill_default_options(Options *); | 156 | void fill_default_options(Options *); |
150 | int read_config_file(const char *, const char *, Options *, int); | 157 | int read_config_file(const char *, const char *, Options *, int); |