diff options
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.71 2001/04/06 21:00:12 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.72 2001/04/14 16:33:20 stevesk Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1603,7 +1603,7 @@ int | |||
1603 | session_pty_req(Session *s) | 1603 | session_pty_req(Session *s) |
1604 | { | 1604 | { |
1605 | u_int len; | 1605 | u_int len; |
1606 | char *term_modes; /* encoded terminal modes */ | 1606 | int n_bytes; |
1607 | 1607 | ||
1608 | if (no_pty_flag) | 1608 | if (no_pty_flag) |
1609 | return 0; | 1609 | return 0; |
@@ -1614,8 +1614,6 @@ session_pty_req(Session *s) | |||
1614 | s->row = packet_get_int(); | 1614 | s->row = packet_get_int(); |
1615 | s->xpixel = packet_get_int(); | 1615 | s->xpixel = packet_get_int(); |
1616 | s->ypixel = packet_get_int(); | 1616 | s->ypixel = packet_get_int(); |
1617 | term_modes = packet_get_string(&len); | ||
1618 | packet_done(); | ||
1619 | 1617 | ||
1620 | if (strcmp(s->term, "") == 0) { | 1618 | if (strcmp(s->term, "") == 0) { |
1621 | xfree(s->term); | 1619 | xfree(s->term); |
@@ -1628,7 +1626,6 @@ session_pty_req(Session *s) | |||
1628 | s->ptyfd = -1; | 1626 | s->ptyfd = -1; |
1629 | s->ttyfd = -1; | 1627 | s->ttyfd = -1; |
1630 | error("session_pty_req: session %d alloc failed", s->self); | 1628 | error("session_pty_req: session %d alloc failed", s->self); |
1631 | xfree(term_modes); | ||
1632 | return 0; | 1629 | return 0; |
1633 | } | 1630 | } |
1634 | debug("session_pty_req: session %d alloc %s", s->self, s->tty); | 1631 | debug("session_pty_req: session %d alloc %s", s->self, s->tty); |
@@ -1641,10 +1638,12 @@ session_pty_req(Session *s) | |||
1641 | /* Get window size from the packet. */ | 1638 | /* Get window size from the packet. */ |
1642 | pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel); | 1639 | pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel); |
1643 | 1640 | ||
1641 | /* Get tty modes from the packet. */ | ||
1642 | tty_parse_modes(s->ttyfd, &n_bytes); | ||
1643 | packet_done(); | ||
1644 | |||
1644 | session_proctitle(s); | 1645 | session_proctitle(s); |
1645 | 1646 | ||
1646 | /* XXX parse and set terminal modes */ | ||
1647 | xfree(term_modes); | ||
1648 | return 1; | 1647 | return 1; |
1649 | } | 1648 | } |
1650 | 1649 | ||