summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-15 14:25:12 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-15 14:25:12 +0000
commitac2f00390392b22bfc971146e61c440ce62cf242 (patch)
tree9158af1bf3e83d8d268ee919aae1feae7254977c
parente626cf8b4aa4443d7c2cec937ddc5e36cb5d89ee (diff)
- OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2001/04/15 01:35:22 [ttymodes.c] fix comments
-rw-r--r--ChangeLog10
-rw-r--r--ttymodes.c6
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 42572538..41dfcf00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010416
+ - OpenBSD CVS Sync
+ - stevesk@cvs.openbsd.org 2001/04/15 01:35:22
+ [ttymodes.c]
+ fix comments
+
20010415
- OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2001/04/14 04:31:01
@@ -15,7 +21,7 @@
- stevesk@cvs.openbsd.org 2001/04/14 17:04:42
[scp.c]
'T' handling rcp/scp sync; ok markus@
- - Missed sshtty.[ch] in Sync.
+ - Missed sshtty.[ch] in Sync.
20010414
- Sync with OpenBSD glob.c, strlcat.c and vis.c changes
@@ -5082,4 +5088,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1116 2001/04/14 23:21:50 mouring Exp $
+$Id: ChangeLog,v 1.1117 2001/04/15 14:25:12 mouring Exp $
diff --git a/ttymodes.c b/ttymodes.c
index 9ce3fbcc..6124cb4b 100644
--- a/ttymodes.c
+++ b/ttymodes.c
@@ -43,7 +43,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ttymodes.c,v 1.12 2001/04/14 16:33:20 stevesk Exp $");
+RCSID("$OpenBSD: ttymodes.c,v 1.13 2001/04/15 01:35:22 stevesk Exp $");
#include "packet.h"
#include "log.h"
@@ -428,7 +428,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
} else {
/*
* SSH2:
- * Opcodes 0 to 159 are defined to have
+ * Opcodes 1 to 159 are defined to have
* a uint32 argument.
* Opcodes 160 to 255 are undefined and
* cause parsing to stop.
@@ -453,7 +453,7 @@ set:
return; /* Don't process bytes passed */
}
if (failure == -1)
- return; /* Packet parsed ok but tty stuff failed */
+ return; /* Packet parsed ok but tcgetattr() failed */
/* Set the new modes for the terminal. */
if (tcsetattr(fd, TCSANOW, &tio) == -1)