tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2008/11/02 00:16:16 

[ttymodes.c]
     protocol 2 tty modes support is now 7.5 years old so remove these
     debug3()s; ok deraadt@
This commit is contained in:
Damien Miller 2008-11-03 19:27:52 +11:00
parent a699d952e5
commit 660d7dabc0
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -96,6 +96,10 @@
[clientloop.c readconf.c readconf.h ssh.c] [clientloop.c readconf.c readconf.h ssh.c]
merge dynamic forward parsing into parse_forward(); merge dynamic forward parsing into parse_forward();
'i think this is OK' djm@ 'i think this is OK' djm@
- stevesk@cvs.openbsd.org 2008/11/02 00:16:16
[ttymodes.c]
protocol 2 tty modes support is now 7.5 years old so remove these
debug3()s; ok deraadt@
20080906 20080906
- (dtucker) [config.guess config.sub] Update to latest versions from - (dtucker) [config.guess config.sub] Update to latest versions from
@ -4830,4 +4834,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5122 2008/11/03 08:27:34 djm Exp $ $Id: ChangeLog,v 1.5123 2008/11/03 08:27:52 djm Exp $

7
ttymodes.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ttymodes.c,v 1.28 2008/07/07 00:31:41 stevesk Exp $ */ /* $OpenBSD: ttymodes.c,v 1.29 2008/11/02 00:16:16 stevesk Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -311,11 +311,9 @@ tty_make_modes(int fd, struct termios *tiop)
/* Store input and output baud rates. */ /* Store input and output baud rates. */
baud = speed_to_baud(cfgetospeed(&tio)); baud = speed_to_baud(cfgetospeed(&tio));
debug3("tty_make_modes: ospeed %d", baud);
buffer_put_char(&buf, tty_op_ospeed); buffer_put_char(&buf, tty_op_ospeed);
buffer_put_int(&buf, baud); buffer_put_int(&buf, baud);
baud = speed_to_baud(cfgetispeed(&tio)); baud = speed_to_baud(cfgetispeed(&tio));
debug3("tty_make_modes: ispeed %d", baud);
buffer_put_char(&buf, tty_op_ispeed); buffer_put_char(&buf, tty_op_ispeed);
buffer_put_int(&buf, baud); buffer_put_int(&buf, baud);
@ -359,7 +357,6 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
if (compat20) { if (compat20) {
*n_bytes_ptr = packet_get_int(); *n_bytes_ptr = packet_get_int();
debug3("tty_parse_modes: SSH2 n_bytes %d", *n_bytes_ptr);
if (*n_bytes_ptr == 0) if (*n_bytes_ptr == 0)
return; return;
get_arg = packet_get_int; get_arg = packet_get_int;
@ -391,7 +388,6 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
case TTY_OP_ISPEED_PROTO2: case TTY_OP_ISPEED_PROTO2:
n_bytes += 4; n_bytes += 4;
baud = packet_get_int(); baud = packet_get_int();
debug3("tty_parse_modes: ispeed %d", baud);
if (failure != -1 && if (failure != -1 &&
cfsetispeed(&tio, baud_to_speed(baud)) == -1) cfsetispeed(&tio, baud_to_speed(baud)) == -1)
error("cfsetispeed failed for %d", baud); error("cfsetispeed failed for %d", baud);
@ -402,7 +398,6 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
case TTY_OP_OSPEED_PROTO2: case TTY_OP_OSPEED_PROTO2:
n_bytes += 4; n_bytes += 4;
baud = packet_get_int(); baud = packet_get_int();
debug3("tty_parse_modes: ospeed %d", baud);
if (failure != -1 && if (failure != -1 &&
cfsetospeed(&tio, baud_to_speed(baud)) == -1) cfsetospeed(&tio, baud_to_speed(baud)) == -1)
error("cfsetospeed failed for %d", baud); error("cfsetospeed failed for %d", baud);