summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--readconf.c12
-rw-r--r--readconf.h4
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 20aa4bd5c..d47ed659f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,12 @@
10 to a buffer when roaming is enabled. 10 to a buffer when roaming is enabled.
11 Most of this code was written by Martin Forssen, maf at appgate dot com. 11 Most of this code was written by Martin Forssen, maf at appgate dot com.
12 ok markus@ 12 ok markus@
13 - andreas@cvs.openbsd.org 2009/06/27 09:35:06
14 [readconf.h readconf.c]
15 Add client option UseRoaming. It doesn't do anything yet but will
16 control whether the client tries to use roaming if enabled on the
17 server. From Martin Forssen.
18 ok markus@
13 19
1420090622 2020090622
15 - (dtucker) OpenBSD CVS Sync 21 - (dtucker) OpenBSD CVS Sync
diff --git a/readconf.c b/readconf.c
index 53fc6c7ba..0bf5d7cb4 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
@@ -130,7 +130,7 @@ typedef enum {
130 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, 130 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
131 oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, 131 oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
132 oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, 132 oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
133 oVisualHostKey, oZeroKnowledgePasswordAuthentication, 133 oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
134 oDeprecated, oUnsupported 134 oDeprecated, oUnsupported
135} OpCodes; 135} OpCodes;
136 136
@@ -228,6 +228,7 @@ static struct {
228 { "localcommand", oLocalCommand }, 228 { "localcommand", oLocalCommand },
229 { "permitlocalcommand", oPermitLocalCommand }, 229 { "permitlocalcommand", oPermitLocalCommand },
230 { "visualhostkey", oVisualHostKey }, 230 { "visualhostkey", oVisualHostKey },
231 { "useroaming", oUseRoaming },
231#ifdef JPAKE 232#ifdef JPAKE
232 { "zeroknowledgepasswordauthentication", 233 { "zeroknowledgepasswordauthentication",
233 oZeroKnowledgePasswordAuthentication }, 234 oZeroKnowledgePasswordAuthentication },
@@ -914,6 +915,10 @@ parse_int:
914 intptr = &options->visual_host_key; 915 intptr = &options->visual_host_key;
915 goto parse_flag; 916 goto parse_flag;
916 917
918 case oUseRoaming:
919 intptr = &options->use_roaming;
920 goto parse_flag;
921
917 case oDeprecated: 922 case oDeprecated:
918 debug("%s line %d: Deprecated option \"%s\"", 923 debug("%s line %d: Deprecated option \"%s\"",
919 filename, linenum, keyword); 924 filename, linenum, keyword);
@@ -1063,6 +1068,7 @@ initialize_options(Options * options)
1063 options->tun_remote = -1; 1068 options->tun_remote = -1;
1064 options->local_command = NULL; 1069 options->local_command = NULL;
1065 options->permit_local_command = -1; 1070 options->permit_local_command = -1;
1071 options->use_roaming = -1;
1066 options->visual_host_key = -1; 1072 options->visual_host_key = -1;
1067 options->zero_knowledge_password_authentication = -1; 1073 options->zero_knowledge_password_authentication = -1;
1068} 1074}
@@ -1199,6 +1205,8 @@ fill_default_options(Options * options)
1199 options->tun_remote = SSH_TUNID_ANY; 1205 options->tun_remote = SSH_TUNID_ANY;
1200 if (options->permit_local_command == -1) 1206 if (options->permit_local_command == -1)
1201 options->permit_local_command = 0; 1207 options->permit_local_command = 0;
1208 if (options->use_roaming == -1)
1209 options->use_roaming = 1;
1202 if (options->visual_host_key == -1) 1210 if (options->visual_host_key == -1)
1203 options->visual_host_key = 0; 1211 options->visual_host_key = 0;
1204 if (options->zero_knowledge_password_authentication == -1) 1212 if (options->zero_knowledge_password_authentication == -1)
diff --git a/readconf.h b/readconf.h
index 8fb3a8528..2ebfebe94 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.h,v 1.78 2009/02/12 03:00:56 djm Exp $ */ 1/* $OpenBSD: readconf.h,v 1.79 2009/06/27 09:35:06 andreas Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -123,6 +123,8 @@ typedef struct {
123 int permit_local_command; 123 int permit_local_command;
124 int visual_host_key; 124 int visual_host_key;
125 125
126 int use_roaming;
127
126} Options; 128} Options;
127 129
128#define SSHCTL_MASTER_NO 0 130#define SSHCTL_MASTER_NO 0