diff options
author | markus@openbsd.org <markus@openbsd.org> | 2018-07-09 21:20:26 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-07-10 15:19:12 +1000 |
commit | 89dd615b8b531979be63f05f9d5624367c9b28e6 (patch) | |
tree | d807c8d1c948fdf71794cd410b9518e9b6499d69 /session.c | |
parent | f4608a7065480516ab46214f554e5f853fb7870f (diff) |
upstream: ttymodes: switch to sshbuf API; ok djm@
OpenBSD-Commit-ID: 5df340c5965e822c9da21e19579d08dea3cbe429
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.301 2018/07/03 10:59:35 djm Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.302 2018/07/09 21:20:26 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -1912,7 +1912,6 @@ static int | |||
1912 | session_pty_req(struct ssh *ssh, Session *s) | 1912 | session_pty_req(struct ssh *ssh, Session *s) |
1913 | { | 1913 | { |
1914 | u_int len; | 1914 | u_int len; |
1915 | int n_bytes; | ||
1916 | 1915 | ||
1917 | if (!auth_opts->permit_pty_flag || !options.permit_tty) { | 1916 | if (!auth_opts->permit_pty_flag || !options.permit_tty) { |
1918 | debug("Allocating a pty not permitted for this connection."); | 1917 | debug("Allocating a pty not permitted for this connection."); |
@@ -1947,8 +1946,7 @@ session_pty_req(struct ssh *ssh, Session *s) | |||
1947 | } | 1946 | } |
1948 | debug("session_pty_req: session %d alloc %s", s->self, s->tty); | 1947 | debug("session_pty_req: session %d alloc %s", s->self, s->tty); |
1949 | 1948 | ||
1950 | n_bytes = packet_remaining(); | 1949 | ssh_tty_parse_modes(ssh, s->ttyfd); |
1951 | tty_parse_modes(s->ttyfd, &n_bytes); | ||
1952 | 1950 | ||
1953 | if (!use_privsep) | 1951 | if (!use_privsep) |
1954 | pty_setowner(s->pw, s->tty); | 1952 | pty_setowner(s->pw, s->tty); |