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 d45a896b..9f63b83b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,11 @@
Most code from Martin Forssen, maf at appgate dot com. Some changes by
me and markus@
ok markus@
+ - 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@
20091226
- (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/ssh.c b/ssh.c
index adfe60e4..5353e235 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.326 2009/07/02 02:11:47 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.327 2009/10/24 11:23:42 andreas Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -100,6 +100,7 @@
#include "match.h"
#include "msg.h"
#include "uidswap.h"
+#include "roaming.h"
#include "version.h"
#ifdef SMARTCARD
@@ -1222,6 +1223,9 @@ ssh_session2(void)
fatal("daemon() failed: %.200s", strerror(errno));
}
+ if (options.use_roaming)
+ request_roaming();
+
return client_loop(tty_flag, tty_flag ?
options.escape_char : SSH_ESCAPECHAR_NONE, id);
}