diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
commit | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch) | |
tree | 1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /readconf.h | |
parent | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff) | |
parent | 54af7a4ae8d455791a631bdfaade4b64436ae16a (diff) |
import openssh-5.2p1-gsskex-all-20090726.patch
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/readconf.h b/readconf.h index 10067f117..1fc653b1b 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 | ||
@@ -44,13 +44,16 @@ typedef struct { | |||
44 | int challenge_response_authentication; | 44 | int challenge_response_authentication; |
45 | /* Try S/Key or TIS, authentication. */ | 45 | /* Try S/Key or TIS, authentication. */ |
46 | int gss_authentication; /* Try GSS authentication */ | 46 | int gss_authentication; /* Try GSS authentication */ |
47 | int gss_keyex; /* Try GSS key exchange */ | 47 | int gss_keyex; /* Try GSS key exchange */ |
48 | int gss_deleg_creds; /* Delegate GSS credentials */ | 48 | int gss_deleg_creds; /* Delegate GSS credentials */ |
49 | int gss_trust_dns; /* Trust DNS for GSS canonicalization */ | 49 | int gss_trust_dns; /* Trust DNS for GSS canonicalization */ |
50 | int gss_renewal_rekey; /* Credential renewal forces rekey */ | ||
51 | char *gss_client_identity; /* Principal to initiate GSSAPI with */ | ||
50 | int password_authentication; /* Try password | 52 | int password_authentication; /* Try password |
51 | * authentication. */ | 53 | * authentication. */ |
52 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ | 54 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ |
53 | char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ | 55 | char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */ |
56 | int zero_knowledge_password_authentication; /* Try jpake */ | ||
54 | int batch_mode; /* Batch mode: do not ask for passwords. */ | 57 | int batch_mode; /* Batch mode: do not ask for passwords. */ |
55 | int check_host_ip; /* Also keep track of keys for IP address */ | 58 | int check_host_ip; /* Also keep track of keys for IP address */ |
56 | int strict_host_key_checking; /* Strict host key checking. */ | 59 | int strict_host_key_checking; /* Strict host key checking. */ |
@@ -135,7 +138,7 @@ typedef struct { | |||
135 | void initialize_options(Options *); | 138 | void initialize_options(Options *); |
136 | void fill_default_options(Options *); | 139 | void fill_default_options(Options *); |
137 | int read_config_file(const char *, const char *, Options *, int); | 140 | int read_config_file(const char *, const char *, Options *, int); |
138 | int parse_forward(Forward *, const char *); | 141 | int parse_forward(Forward *, const char *, int, int); |
139 | 142 | ||
140 | int | 143 | int |
141 | process_config_line(Options *, const char *, char *, const char *, int, int *); | 144 | process_config_line(Options *, const char *, char *, const char *, int, int *); |