summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--channels.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6509548bc..588fcf6d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
9 this is. 9 this is.
10 - (dtucker) [Makefile.in] append $CFLAGS to compiler options when building 10 - (dtucker) [Makefile.in] append $CFLAGS to compiler options when building
11 modpipe in case there's anything in there we need. 11 modpipe in case there's anything in there we need.
12 - (dtucker) OpenBSD CVS Sync
13 - dtucker@cvs.openbsd.org 2013/06/02 21:01:51
14 [channels.h]
15 typo in comment
12 16
1320130602 1720130602
14 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy 18 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
diff --git a/channels.h b/channels.h
index d75b800f7..a11b6227b 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.h,v 1.111 2012/04/11 13:16:19 djm Exp $ */ 1/* $OpenBSD: channels.h,v 1.112 2013/06/02 21:01:51 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -110,7 +110,7 @@ struct Channel {
110 * channels are delayed until the first call 110 * channels are delayed until the first call
111 * to a matching pre-select handler. 111 * to a matching pre-select handler.
112 * this way post-select handlers are not 112 * this way post-select handlers are not
113 * accidenly called if a FD gets reused */ 113 * accidentally called if a FD gets reused */
114 Buffer input; /* data read from socket, to be sent over 114 Buffer input; /* data read from socket, to be sent over
115 * encrypted connection */ 115 * encrypted connection */
116 Buffer output; /* data received over encrypted connection for 116 Buffer output; /* data received over encrypted connection for