summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c
index 484db3e5f..b6abeed06 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
@@ -131,7 +131,7 @@ typedef enum {
131 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, 131 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
132 oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, 132 oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
133 oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, 133 oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
134 oVisualHostKey, oZeroKnowledgePasswordAuthentication, 134 oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
135 oDeprecated, oUnsupported 135 oDeprecated, oUnsupported
136} OpCodes; 136} OpCodes;
137 137
@@ -237,6 +237,7 @@ static struct {
237 { "localcommand", oLocalCommand }, 237 { "localcommand", oLocalCommand },
238 { "permitlocalcommand", oPermitLocalCommand }, 238 { "permitlocalcommand", oPermitLocalCommand },
239 { "visualhostkey", oVisualHostKey }, 239 { "visualhostkey", oVisualHostKey },
240 { "useroaming", oUseRoaming },
240#ifdef JPAKE 241#ifdef JPAKE
241 { "zeroknowledgepasswordauthentication", 242 { "zeroknowledgepasswordauthentication",
242 oZeroKnowledgePasswordAuthentication }, 243 oZeroKnowledgePasswordAuthentication },
@@ -939,6 +940,10 @@ parse_int:
939 intptr = &options->visual_host_key; 940 intptr = &options->visual_host_key;
940 goto parse_flag; 941 goto parse_flag;
941 942
943 case oUseRoaming:
944 intptr = &options->use_roaming;
945 goto parse_flag;
946
942 case oDeprecated: 947 case oDeprecated:
943 debug("%s line %d: Deprecated option \"%s\"", 948 debug("%s line %d: Deprecated option \"%s\"",
944 filename, linenum, keyword); 949 filename, linenum, keyword);
@@ -1092,6 +1097,7 @@ initialize_options(Options * options)
1092 options->tun_remote = -1; 1097 options->tun_remote = -1;
1093 options->local_command = NULL; 1098 options->local_command = NULL;
1094 options->permit_local_command = -1; 1099 options->permit_local_command = -1;
1100 options->use_roaming = -1;
1095 options->visual_host_key = -1; 1101 options->visual_host_key = -1;
1096 options->zero_knowledge_password_authentication = -1; 1102 options->zero_knowledge_password_authentication = -1;
1097} 1103}
@@ -1234,6 +1240,8 @@ fill_default_options(Options * options)
1234 options->tun_remote = SSH_TUNID_ANY; 1240 options->tun_remote = SSH_TUNID_ANY;
1235 if (options->permit_local_command == -1) 1241 if (options->permit_local_command == -1)
1236 options->permit_local_command = 0; 1242 options->permit_local_command = 0;
1243 if (options->use_roaming == -1)
1244 options->use_roaming = 1;
1237 if (options->visual_host_key == -1) 1245 if (options->visual_host_key == -1)
1238 options->visual_host_key = 0; 1246 options->visual_host_key = 0;
1239 if (options->zero_knowledge_password_authentication == -1) 1247 if (options->zero_knowledge_password_authentication == -1)