summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-08 16:54:59 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-08 16:54:59 +1100
commitf1de4e5228ad86b191c3297bf6c528753587be5e (patch)
treea8a53a07238f9993ef7be988b06e98aed3682f7b
parente730118bf41c70bd519e595a7dda39df551852eb (diff)
- andreas@cvs.openbsd.org 2009/10/24 11:23:42
[ssh.c] Request roaming to be enabled if UseRoaming is true and the server supports it. ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d45a896bb..9f63b83b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,11 @@
25 Most code from Martin Forssen, maf at appgate dot com. Some changes by 25 Most code from Martin Forssen, maf at appgate dot com. Some changes by
26 me and markus@ 26 me and markus@
27 ok markus@ 27 ok markus@
28 - andreas@cvs.openbsd.org 2009/10/24 11:23:42
29 [ssh.c]
30 Request roaming to be enabled if UseRoaming is true and the server
31 supports it.
32 ok markus@
28 33
2920091226 3420091226
30 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 35 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/ssh.c b/ssh.c
index adfe60e4b..5353e235c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.326 2009/07/02 02:11:47 dtucker Exp $ */ 1/* $OpenBSD: ssh.c,v 1.327 2009/10/24 11:23:42 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
@@ -100,6 +100,7 @@
100#include "match.h" 100#include "match.h"
101#include "msg.h" 101#include "msg.h"
102#include "uidswap.h" 102#include "uidswap.h"
103#include "roaming.h"
103#include "version.h" 104#include "version.h"
104 105
105#ifdef SMARTCARD 106#ifdef SMARTCARD
@@ -1222,6 +1223,9 @@ ssh_session2(void)
1222 fatal("daemon() failed: %.200s", strerror(errno)); 1223 fatal("daemon() failed: %.200s", strerror(errno));
1223 } 1224 }
1224 1225
1226 if (options.use_roaming)
1227 request_roaming();
1228
1225 return client_loop(tty_flag, tty_flag ? 1229 return client_loop(tty_flag, tty_flag ?
1226 options.escape_char : SSH_ESCAPECHAR_NONE, id); 1230 options.escape_char : SSH_ESCAPECHAR_NONE, id);
1227} 1231}