summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorAndreas Gunnarsson <andreas@cvs.openbsd.org>2009-10-24 11:23:43 +0000
committerAndreas Gunnarsson <andreas@cvs.openbsd.org>2009-10-24 11:23:43 +0000
commit29cb11d88855d61e3765442a5f1b35267dbeecf9 (patch)
tree84190442a249924b7c926e2994e1528e6d4d6aaf /usr.bin
parent17c3bbf5c122e8768982eab57386ec0f705b4a00 (diff)
Request roaming to be enabled if UseRoaming is true and the server
supports it. ok markus@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 0408af63052..79a84de819f 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/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
@@ -91,6 +91,7 @@
#include "match.h"
#include "msg.h"
#include "uidswap.h"
+#include "roaming.h"
#include "version.h"
#ifdef SMARTCARD
@@ -1203,6 +1204,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);
}