1 files changed, 12 insertions, 1 deletions

diff --git a/kex.c b/kex.c
index 4c19be9a0..a09e25228 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.81 2009/05/27 06:34:36 andreas Exp $ */
+/* $OpenBSD: kex.c,v 1.82 2009/10/24 11:13:54 andreas Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -48,6 +48,7 @@
 #include "match.h"
 #include "dispatch.h"
 #include "monitor.h"
+#include "roaming.h"
 
 #ifdef GSSAPI
 #include "ssh-gss.h"
@@ -404,6 +405,16 @@ kex_choose_conf(Kex *kex)
                 sprop=peer;
         }
 
+        /* Check whether server offers roaming */
+        if (!kex->server) {
+                char *roaming;
+                roaming = match_list(KEX_RESUME, peer[PROPOSAL_KEX_ALGS], NULL);
+                if (roaming) {
+                        kex->roaming = 1;
+                        xfree(roaming);
+                }
+        }
+
         /* Algorithm Negotiation */
         for (mode = 0; mode < MODE_MAX; mode++) {
                 newkeys = xcalloc(1, sizeof(*newkeys));