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/07/07 00:31:41 

[ttymodes.c]
     we don't need arg after the debug3() was removed.  from lint.
     ok djm@
This commit is contained in:
Damien Miller 2008-07-11 17:34:35 +10:00
parent 73193b3693
commit 2f7faf19d5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,10 @@
20080711
- (djm) OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2008/07/07 00:31:41
[ttymodes.c]
we don't need arg after the debug3() was removed. from lint.
ok djm@
20080709 20080709
- (djm) [Makefile.in] Print "all tests passed" when all regress tests pass - (djm) [Makefile.in] Print "all tests passed" when all regress tests pass
- (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM - (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM
@ -4603,4 +4610,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.5069 2008/07/09 11:07:19 djm Exp $ $Id: ChangeLog,v 1.5070 2008/07/11 07:34:35 djm Exp $

6
ttymodes.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ttymodes.c,v 1.27 2008/05/19 15:45:07 djm Exp $ */ /* $OpenBSD: ttymodes.c,v 1.28 2008/07/07 00:31:41 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
@ -355,7 +355,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
int n_bytes = 0; int n_bytes = 0;
int failure = 0; int failure = 0;
u_int (*get_arg)(void); u_int (*get_arg)(void);
int arg, arg_size; int arg_size;
if (compat20) { if (compat20) {
*n_bytes_ptr = packet_get_int(); *n_bytes_ptr = packet_get_int();
@ -416,7 +416,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
#define TTYMODE(NAME, FIELD, OP) \ #define TTYMODE(NAME, FIELD, OP) \
case OP: \ case OP: \
n_bytes += arg_size; \ n_bytes += arg_size; \
if ((arg = get_arg())) \ if (get_arg()) \
tio.FIELD |= NAME; \ tio.FIELD |= NAME; \
else \ else \
tio.FIELD &= ~NAME; \ tio.FIELD &= ~NAME; \