diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 15:43:03 +0100 |
commit | 8faf8c84430cf3c19705b1d9f8889d256e7fd1fd (patch) | |
tree | e6cb74192adb00fda5e4d1457547851d7e0d86af /readconf.h | |
parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) | |
parent | c41345ad7ee5a22689e2c009595e85fa27b4b39a (diff) |
merge 6.3p1
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h index 0835cb671..675b35dfe 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.93 2013/02/22 04:45:09 dtucker Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.95 2013/05/16 04:27:50 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -115,6 +115,7 @@ typedef struct { | |||
115 | 115 | ||
116 | int enable_ssh_keysign; | 116 | int enable_ssh_keysign; |
117 | int64_t rekey_limit; | 117 | int64_t rekey_limit; |
118 | int rekey_interval; | ||
118 | int no_host_authentication_for_localhost; | 119 | int no_host_authentication_for_localhost; |
119 | int identities_only; | 120 | int identities_only; |
120 | int server_alive_interval; | 121 | int server_alive_interval; |
@@ -141,6 +142,8 @@ typedef struct { | |||
141 | int use_roaming; | 142 | int use_roaming; |
142 | 143 | ||
143 | int request_tty; | 144 | int request_tty; |
145 | |||
146 | char *ignored_unknown; /* Pattern list of unknown tokens to ignore */ | ||
144 | } Options; | 147 | } Options; |
145 | 148 | ||
146 | #define SSHCTL_MASTER_NO 0 | 149 | #define SSHCTL_MASTER_NO 0 |