summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--channels.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c4349e68..ada526cb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,6 +143,9 @@
143 - markus@cvs.openbsd.org 2001/03/03 23:59:34 143 - markus@cvs.openbsd.org 2001/03/03 23:59:34
144 [log.c ssh.c] 144 [log.c ssh.c]
145 log*.c -> log.c 145 log*.c -> log.c
146 - markus@cvs.openbsd.org 2001/03/04 00:03:59
147 [channels.c]
148 debug1->2
146 149
14720010304 15020010304
148 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 151 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4335,4 +4338,4 @@
4335 - Wrote replacements for strlcpy and mkdtemp 4338 - Wrote replacements for strlcpy and mkdtemp
4336 - Released 1.0pre1 4339 - Released 1.0pre1
4337 4340
4338$Id: ChangeLog,v 1.895 2001/03/05 07:24:46 mouring Exp $ 4341$Id: ChangeLog,v 1.896 2001/03/05 07:27:13 mouring Exp $
diff --git a/channels.c b/channels.c
index bca7268b8..1d74efe0c 100644
--- a/channels.c
+++ b/channels.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: channels.c,v 1.96 2001/02/28 21:31:32 markus Exp $"); 43RCSID("$OpenBSD: channels.c,v 1.97 2001/03/04 00:03:59 markus Exp $");
44 44
45#include <openssl/rsa.h> 45#include <openssl/rsa.h>
46#include <openssl/dsa.h> 46#include <openssl/dsa.h>
@@ -1069,7 +1069,7 @@ channel_output_poll()
1069 if (compat20 && 1069 if (compat20 &&
1070 (c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD))) { 1070 (c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD))) {
1071 /* XXX is this true? */ 1071 /* XXX is this true? */
1072 debug("channel %d: no data after CLOSE", c->self); 1072 debug2("channel %d: no data after CLOSE", c->self);
1073 continue; 1073 continue;
1074 } 1074 }
1075 1075