diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:32:03 +0000 |
commit | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (patch) | |
tree | af8e928bd79d3f2d0219bb5b2c78b573ec31d94c /readconf.h | |
parent | 9ad7b718d42e43f3a285fcbc8f91193931fce324 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
import openssh-4.2p1-gsskex-20050926-2.patch
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index de4b4cb27..b403c10ec 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.66 2005/03/01 10:40:27 djm Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.67 2005/06/08 11:25:09 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -46,6 +46,7 @@ typedef struct { | |||
46 | /* Try S/Key or TIS, authentication. */ | 46 | /* Try S/Key or TIS, authentication. */ |
47 | int gss_authentication; /* Try GSS authentication */ | 47 | int gss_authentication; /* Try GSS authentication */ |
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 password_authentication; /* Try password | 50 | int password_authentication; /* Try password |
50 | * authentication. */ | 51 | * authentication. */ |
51 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ | 52 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ |
@@ -116,6 +117,11 @@ typedef struct { | |||
116 | int hash_known_hosts; | 117 | int hash_known_hosts; |
117 | } Options; | 118 | } Options; |
118 | 119 | ||
120 | #define SSHCTL_MASTER_NO 0 | ||
121 | #define SSHCTL_MASTER_YES 1 | ||
122 | #define SSHCTL_MASTER_AUTO 2 | ||
123 | #define SSHCTL_MASTER_ASK 3 | ||
124 | #define SSHCTL_MASTER_AUTO_ASK 4 | ||
119 | 125 | ||
120 | void initialize_options(Options *); | 126 | void initialize_options(Options *); |
121 | void fill_default_options(Options *); | 127 | void fill_default_options(Options *); |