diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /readconf.h | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index d26063a0b..a68734437 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> |
@@ -117,6 +117,11 @@ typedef struct { | |||
117 | int hash_known_hosts; | 117 | int hash_known_hosts; |
118 | } Options; | 118 | } Options; |
119 | 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 | ||
120 | 125 | ||
121 | void initialize_options(Options *); | 126 | void initialize_options(Options *); |
122 | void fill_default_options(Options *); | 127 | void fill_default_options(Options *); |