summaryrefslogtreecommitdiffstats
path: root/session.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-07-09 21:20:26 +0000
committerDamien Miller <djm@mindrot.org>2018-07-10 15:19:12 +1000
commit89dd615b8b531979be63f05f9d5624367c9b28e6 (patch)
treed807c8d1c948fdf71794cd410b9518e9b6499d69 /session.c
parentf4608a7065480516ab46214f554e5f853fb7870f (diff)
upstream: ttymodes: switch to sshbuf API; ok djm@
Diffstat (limited to 'session.c')
-rw-r--r--session.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/session.c b/session.c
index 18a106f6..88235902 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.301 2018/07/03 10:59:35 djm Exp $ */
+/* $OpenBSD: session.c,v 1.302 2018/07/09 21:20:26 markus Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -1912,7 +1912,6 @@ static int
session_pty_req(struct ssh *ssh, Session *s)
{
u_int len;
- int n_bytes;
if (!auth_opts->permit_pty_flag || !options.permit_tty) {
debug("Allocating a pty not permitted for this connection.");
@@ -1947,8 +1946,7 @@ session_pty_req(struct ssh *ssh, Session *s)
}
debug("session_pty_req: session %d alloc %s", s->self, s->tty);
- n_bytes = packet_remaining();
- tty_parse_modes(s->ttyfd, &n_bytes);
+ ssh_tty_parse_modes(ssh, s->ttyfd);
if (!use_privsep)
pty_setowner(s->pw, s->tty);