import openssh-5.3p1-gsskex-all-20100124.patch

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 @@
-/* $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
@@ -131,7 +131,7 @@ typedef enum {
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
         oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
-        oVisualHostKey, oZeroKnowledgePasswordAuthentication,
+        oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
         oDeprecated, oUnsupported
 } OpCodes;
 
@@ -237,6 +237,7 @@ static struct {
         { "localcommand", oLocalCommand },
         { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },
+        { "useroaming", oUseRoaming },
 #ifdef JPAKE
         { "zeroknowledgepasswordauthentication",
             oZeroKnowledgePasswordAuthentication },
@@ -939,6 +940,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);
@@ -1092,6 +1097,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;
 }
@@ -1234,6 +1240,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)