diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:11:45 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-01 09:38:46 +1000 |
commit | 99f95ba82673d33215dce17bfa1512b57f54ec09 (patch) | |
tree | a2fcb5c8410cf2d524b25609271b4197728779d5 /readconf.h | |
parent | 56912dea6ef63dae4eb1194e5d88973a7c6c5740 (diff) |
upstream commit
remove options.protocol and client Protocol
configuration knob
ok markus@
Upstream-ID: 5a967f5d06e2d004b0235457b6de3a9a314e9366
Diffstat (limited to 'readconf.h')
-rw-r--r-- | readconf.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h index d62428101..f53864854 100644 --- a/readconf.h +++ b/readconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.h,v 1.118 2017/04/28 03:20:27 dtucker Exp $ */ | 1 | /* $OpenBSD: readconf.h,v 1.119 2017/04/30 23:11:45 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -75,7 +75,6 @@ typedef struct { | |||
75 | char *macs; /* SSH2 macs in order of preference. */ | 75 | char *macs; /* SSH2 macs in order of preference. */ |
76 | char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ | 76 | char *hostkeyalgorithms; /* SSH2 server key types in order of preference. */ |
77 | char *kex_algorithms; /* SSH2 kex methods in order of preference. */ | 77 | char *kex_algorithms; /* SSH2 kex methods in order of preference. */ |
78 | int protocol; /* Protocol in order of preference. */ | ||
79 | char *hostname; /* Real host to connect. */ | 78 | char *hostname; /* Real host to connect. */ |
80 | char *host_key_alias; /* hostname alias for .ssh/known_hosts */ | 79 | char *host_key_alias; /* hostname alias for .ssh/known_hosts */ |
81 | char *proxy_command; /* Proxy command for connecting the host. */ | 80 | char *proxy_command; /* Proxy command for connecting the host. */ |