diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /readconf.h | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/readconf.h b/readconf.h index bb70e9373..a3d302420 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.68 2005/12/06 22:38:27 reyk Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.71 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -16,8 +16,6 @@ | |||
16 | #ifndef READCONF_H | 16 | #ifndef READCONF_H |
17 | #define READCONF_H | 17 | #define READCONF_H |
18 | 18 | ||
19 | #include "key.h" | ||
20 | |||
21 | /* Data structure for representing a forwarding request. */ | 19 | /* Data structure for representing a forwarding request. */ |
22 | 20 | ||
23 | typedef struct { | 21 | typedef struct { |
@@ -34,6 +32,7 @@ typedef struct { | |||
34 | int forward_agent; /* Forward authentication agent. */ | 32 | int forward_agent; /* Forward authentication agent. */ |
35 | int forward_x11; /* Forward X11 display. */ | 33 | int forward_x11; /* Forward X11 display. */ |
36 | int forward_x11_trusted; /* Trust Forward X11 display. */ | 34 | int forward_x11_trusted; /* Trust Forward X11 display. */ |
35 | int exit_on_forward_failure; /* Exit if bind(2) fails for -L/-R */ | ||
37 | char *xauth_location; /* Location for xauth program */ | 36 | char *xauth_location; /* Location for xauth program */ |
38 | int gateway_ports; /* Allow remote connects to forwarded ports. */ | 37 | int gateway_ports; /* Allow remote connects to forwarded ports. */ |
39 | int use_privileged_port; /* Don't use privileged port if false. */ | 38 | int use_privileged_port; /* Don't use privileged port if false. */ |
@@ -45,6 +44,7 @@ typedef struct { | |||
45 | int challenge_response_authentication; | 44 | int challenge_response_authentication; |
46 | /* Try S/Key or TIS, authentication. */ | 45 | /* Try S/Key or TIS, authentication. */ |
47 | int gss_authentication; /* Try GSS authentication */ | 46 | int gss_authentication; /* Try GSS authentication */ |
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 password_authentication; /* Try password | 50 | int password_authentication; /* Try password |