diff options
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/readconf.h b/readconf.h index 47c7aef4e..8fb3a8528 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.74 2008/06/26 11:46:31 grunk Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.78 2009/02/12 03:00:56 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -20,9 +20,9 @@ | |||
20 | 20 | ||
21 | typedef struct { | 21 | typedef struct { |
22 | char *listen_host; /* Host (address) to listen on. */ | 22 | char *listen_host; /* Host (address) to listen on. */ |
23 | u_short listen_port; /* Port to forward. */ | 23 | int listen_port; /* Port to forward. */ |
24 | char *connect_host; /* Host to connect. */ | 24 | char *connect_host; /* Host to connect. */ |
25 | u_short connect_port; /* Port to connect on connect_host. */ | 25 | int connect_port; /* Port to connect on connect_host. */ |
26 | } Forward; | 26 | } Forward; |
27 | /* Data structure for representing option data. */ | 27 | /* Data structure for representing option data. */ |
28 | 28 | ||
@@ -49,6 +49,7 @@ typedef struct { | |||
49 | * authentication. */ | 49 | * authentication. */ |
50 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ | 50 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ |
51 | char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ | 51 | char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ |
52 | int zero_knowledge_password_authentication; /* Try jpake */ | ||
52 | int batch_mode; /* Batch mode: do not ask for passwords. */ | 53 | int batch_mode; /* Batch mode: do not ask for passwords. */ |
53 | int check_host_ip; /* Also keep track of keys for IP address */ | 54 | int check_host_ip; /* Also keep track of keys for IP address */ |
54 | int strict_host_key_checking; /* Strict host key checking. */ | 55 | int strict_host_key_checking; /* Strict host key checking. */ |
@@ -133,7 +134,7 @@ typedef struct { | |||
133 | void initialize_options(Options *); | 134 | void initialize_options(Options *); |
134 | void fill_default_options(Options *); | 135 | void fill_default_options(Options *); |
135 | int read_config_file(const char *, const char *, Options *, int); | 136 | int read_config_file(const char *, const char *, Options *, int); |
136 | int parse_forward(Forward *, const char *); | 137 | int parse_forward(Forward *, const char *, int, int); |
137 | 138 | ||
138 | int | 139 | int |
139 | process_config_line(Options *, const char *, char *, const char *, int, int *); | 140 | process_config_line(Options *, const char *, char *, const char *, int, int *); |