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 @@
      to a buffer when roaming is enabled.
      Most of this code was written by Martin Forssen, maf at appgate dot com.
      ok markus@
+   - andreas@cvs.openbsd.org 2009/06/27 09:35:06
+     [readconf.h readconf.c]
+     Add client option UseRoaming. It doesn't do anything yet but will
+     control whether the client tries to use roaming if enabled on the
+     server. From Martin Forssen.
+     ok markus@
 
 20090622
  - (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 @@
-/* $OpenBSD: readconf.c,v 1.176 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.177 2009/06/27 09:35:06 andreas Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -130,7 +130,7 @@ typedef enum {
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
-        oVisualHostKey, oZeroKnowledgePasswordAuthentication,
+        oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oDeprecated, oUnsupported
 } OpCodes;
 
@@ -228,6 +228,7 @@ static struct {
         { "localcommand", oLocalCommand },
         { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },
+        { "useroaming", oUseRoaming },
 #ifdef JPAKE
         { "zeroknowledgepasswordauthentication",
             oZeroKnowledgePasswordAuthentication },
@@ -914,6 +915,10 @@ parse_int:
                 intptr = &options->visual_host_key;
                 goto parse_flag;
 
+        case oUseRoaming:
+                intptr = &options->use_roaming;
+                goto parse_flag;
+
         case oDeprecated:
                 debug("%s line %d: Deprecated option \"%s\"",
                     filename, linenum, keyword);
@@ -1063,6 +1068,7 @@ initialize_options(Options * options)
         options->tun_remote = -1;
         options->local_command = NULL;
         options->permit_local_command = -1;
+        options->use_roaming = -1;
         options->visual_host_key = -1;
         options->zero_knowledge_password_authentication = -1;
 }
@@ -1199,6 +1205,8 @@ fill_default_options(Options * options)
                 options->tun_remote = SSH_TUNID_ANY;
         if (options->permit_local_command == -1)
                 options->permit_local_command = 0;
+        if (options->use_roaming == -1)
+                options->use_roaming = 1;
         if (options->visual_host_key == -1)
                 options->visual_host_key = 0;
         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 @@
-/* $OpenBSD: readconf.h,v 1.78 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.79 2009/06/27 09:35:06 andreas Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -123,6 +123,8 @@ typedef struct {
         int     permit_local_command;
         int     visual_host_key;
 
+        int     use_roaming;
+
 }       Options;
 
 #define SSHCTL_MASTER_NO        0