diff options
author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:39 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:34:16 +0000 |
commit | 2ee2de47fd0f684f54218d31b4ec83930e69c18e (patch) | |
tree | 86848a7668424b392d48791a0e41e05f9df7b62b /readconf.h | |
parent | c9947303ad3c432b1cadfbeb1d95a7cd38662d66 (diff) | |
parent | 9cbb60f5e4932634db04c330c88abc49cc5567bd (diff) |
Merge 6.6p1.
* New upstream release (http://www.openssh.com/txt/release-6.6).
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h index 826c6767b..5cc97f0da 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.99 2013/10/16 22:49:38 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.101 2014/02/23 20:11:36 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -64,7 +64,6 @@ typedef struct { | |||
64 | * authentication. */ | 64 | * authentication. */ |
65 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ | 65 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ |
66 | char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ | 66 | char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ |
67 | int zero_knowledge_password_authentication; /* Try jpake */ | ||
68 | int batch_mode; /* Batch mode: do not ask for passwords. */ | 67 | int batch_mode; /* Batch mode: do not ask for passwords. */ |
69 | int check_host_ip; /* Also keep track of keys for IP address */ | 68 | int check_host_ip; /* Also keep track of keys for IP address */ |
70 | int strict_host_key_checking; /* Strict host key checking. */ | 69 | int strict_host_key_checking; /* Strict host key checking. */ |
@@ -182,12 +181,14 @@ typedef struct { | |||
182 | 181 | ||
183 | void initialize_options(Options *); | 182 | void initialize_options(Options *); |
184 | void fill_default_options(Options *); | 183 | void fill_default_options(Options *); |
184 | void fill_default_options_for_canonicalization(Options *); | ||
185 | int process_config_line(Options *, struct passwd *, const char *, char *, | 185 | int process_config_line(Options *, struct passwd *, const char *, char *, |
186 | const char *, int, int *, int); | 186 | const char *, int, int *, int); |
187 | int read_config_file(const char *, struct passwd *, const char *, | 187 | int read_config_file(const char *, struct passwd *, const char *, |
188 | Options *, int); | 188 | Options *, int); |
189 | int parse_forward(Forward *, const char *, int, int); | 189 | int parse_forward(Forward *, const char *, int, int); |
190 | int default_ssh_port(void); | 190 | int default_ssh_port(void); |
191 | int option_clear_or_none(const char *); | ||
191 | 192 | ||
192 | void add_local_forward(Options *, const Forward *); | 193 | void add_local_forward(Options *, const Forward *); |
193 | void add_remote_forward(Options *, const Forward *); | 194 | void add_remote_forward(Options *, const Forward *); |