diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ttymodes.c | 6 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20080711 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - stevesk@cvs.openbsd.org 2008/07/07 00:31:41 | ||
4 | [ttymodes.c] | ||
5 | we don't need arg after the debug3() was removed. from lint. | ||
6 | ok djm@ | ||
7 | |||
1 | 20080709 | 8 | 20080709 |
2 | - (djm) [Makefile.in] Print "all tests passed" when all regress tests pass | 9 | - (djm) [Makefile.in] Print "all tests passed" when all regress tests pass |
3 | - (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM | 10 | - (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM |
@@ -4603,4 +4610,4 @@ | |||
4603 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4610 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4604 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4611 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4605 | 4612 | ||
4606 | $Id: ChangeLog,v 1.5069 2008/07/09 11:07:19 djm Exp $ | 4613 | $Id: ChangeLog,v 1.5070 2008/07/11 07:34:35 djm Exp $ |
diff --git a/ttymodes.c b/ttymodes.c index d11d00c28..e116b1999 100644 --- a/ttymodes.c +++ b/ttymodes.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ttymodes.c,v 1.27 2008/05/19 15:45:07 djm Exp $ */ | 1 | /* $OpenBSD: ttymodes.c,v 1.28 2008/07/07 00:31:41 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -355,7 +355,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) | |||
355 | int n_bytes = 0; | 355 | int n_bytes = 0; |
356 | int failure = 0; | 356 | int failure = 0; |
357 | u_int (*get_arg)(void); | 357 | u_int (*get_arg)(void); |
358 | int arg, arg_size; | 358 | int arg_size; |
359 | 359 | ||
360 | if (compat20) { | 360 | if (compat20) { |
361 | *n_bytes_ptr = packet_get_int(); | 361 | *n_bytes_ptr = packet_get_int(); |
@@ -416,7 +416,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) | |||
416 | #define TTYMODE(NAME, FIELD, OP) \ | 416 | #define TTYMODE(NAME, FIELD, OP) \ |
417 | case OP: \ | 417 | case OP: \ |
418 | n_bytes += arg_size; \ | 418 | n_bytes += arg_size; \ |
419 | if ((arg = get_arg())) \ | 419 | if (get_arg()) \ |
420 | tio.FIELD |= NAME; \ | 420 | tio.FIELD |= NAME; \ |
421 | else \ | 421 | else \ |
422 | tio.FIELD &= ~NAME; \ | 422 | tio.FIELD &= ~NAME; \ |