diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 22:46:54 +0000 |
commit | 59247ecde39f2d826a94ab07f6095ca1f6644e88 (patch) | |
tree | 5910d4a840352aafbf67e8a39fa63936e5529b26 /readconf.c | |
parent | 07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (diff) | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) |
* New upstream release.
* Update to GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index be27e75bc..163244ed9 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.176 2009/02/12 03:00:56 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.177 2009/06/27 09:35:06 andreas Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -134,7 +134,7 @@ typedef enum { | |||
134 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, | 134 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, |
135 | oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, | 135 | oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, |
136 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, | 136 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
137 | oVisualHostKey, oZeroKnowledgePasswordAuthentication, | 137 | oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, |
138 | oProtocolKeepAlives, oSetupTimeOut, | 138 | oProtocolKeepAlives, oSetupTimeOut, |
139 | oDeprecated, oUnsupported | 139 | oDeprecated, oUnsupported |
140 | } OpCodes; | 140 | } OpCodes; |
@@ -242,6 +242,7 @@ static struct { | |||
242 | { "localcommand", oLocalCommand }, | 242 | { "localcommand", oLocalCommand }, |
243 | { "permitlocalcommand", oPermitLocalCommand }, | 243 | { "permitlocalcommand", oPermitLocalCommand }, |
244 | { "visualhostkey", oVisualHostKey }, | 244 | { "visualhostkey", oVisualHostKey }, |
245 | { "useroaming", oUseRoaming }, | ||
245 | #ifdef JPAKE | 246 | #ifdef JPAKE |
246 | { "zeroknowledgepasswordauthentication", | 247 | { "zeroknowledgepasswordauthentication", |
247 | oZeroKnowledgePasswordAuthentication }, | 248 | oZeroKnowledgePasswordAuthentication }, |
@@ -952,6 +953,10 @@ parse_int: | |||
952 | intptr = &options->visual_host_key; | 953 | intptr = &options->visual_host_key; |
953 | goto parse_flag; | 954 | goto parse_flag; |
954 | 955 | ||
956 | case oUseRoaming: | ||
957 | intptr = &options->use_roaming; | ||
958 | goto parse_flag; | ||
959 | |||
955 | case oDeprecated: | 960 | case oDeprecated: |
956 | debug("%s line %d: Deprecated option \"%s\"", | 961 | debug("%s line %d: Deprecated option \"%s\"", |
957 | filename, linenum, keyword); | 962 | filename, linenum, keyword); |
@@ -1125,6 +1130,7 @@ initialize_options(Options * options) | |||
1125 | options->tun_remote = -1; | 1130 | options->tun_remote = -1; |
1126 | options->local_command = NULL; | 1131 | options->local_command = NULL; |
1127 | options->permit_local_command = -1; | 1132 | options->permit_local_command = -1; |
1133 | options->use_roaming = -1; | ||
1128 | options->visual_host_key = -1; | 1134 | options->visual_host_key = -1; |
1129 | options->zero_knowledge_password_authentication = -1; | 1135 | options->zero_knowledge_password_authentication = -1; |
1130 | } | 1136 | } |
@@ -1274,6 +1280,8 @@ fill_default_options(Options * options) | |||
1274 | options->tun_remote = SSH_TUNID_ANY; | 1280 | options->tun_remote = SSH_TUNID_ANY; |
1275 | if (options->permit_local_command == -1) | 1281 | if (options->permit_local_command == -1) |
1276 | options->permit_local_command = 0; | 1282 | options->permit_local_command = 0; |
1283 | if (options->use_roaming == -1) | ||
1284 | options->use_roaming = 1; | ||
1277 | if (options->visual_host_key == -1) | 1285 | if (options->visual_host_key == -1) |
1278 | options->visual_host_key = 0; | 1286 | options->visual_host_key = 0; |
1279 | if (options->zero_knowledge_password_authentication == -1) | 1287 | if (options->zero_knowledge_password_authentication == -1) |