summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--channels.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fae787ac0..35b35c1d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
120030108 120030108
2 - (djm) Sync openbsd-compat/ with OpenBSD -current 2 - (djm) Sync openbsd-compat/ with OpenBSD -current
3 - (djm) Avoid redundant xstrdup/xfree in auth2-pam.c. From Solar via markus@ 3 - (djm) Avoid redundant xstrdup/xfree in auth2-pam.c. From Solar via markus@
4 - (djm) OpenBSD CVS Sync
5 - markus@cvs.openbsd.org 2003/01/01 18:08:52
6 [channels.c]
7 move big output buffer messages to debug2
4 8
520030107 920030107
6 - (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses. 10 - (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses.
@@ -946,4 +950,4 @@
946 save auth method before monitor_reset_key_state(); bugzilla bug #284; 950 save auth method before monitor_reset_key_state(); bugzilla bug #284;
947 ok provos@ 951 ok provos@
948 952
949$Id: ChangeLog,v 1.2550 2003/01/08 01:37:03 djm Exp $ 953$Id: ChangeLog,v 1.2551 2003/01/08 03:04:09 djm Exp $
diff --git a/channels.c b/channels.c
index 1586ea397..2fb22f7c4 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.184 2002/12/13 10:03:15 markus Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.185 2003/01/01 18:08:52 markus Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -413,13 +413,13 @@ channel_not_very_much_buffered_data(void)
413#if 0 413#if 0
414 if (!compat20 && 414 if (!compat20 &&
415 buffer_len(&c->input) > packet_get_maxsize()) { 415 buffer_len(&c->input) > packet_get_maxsize()) {
416 debug("channel %d: big input buffer %d", 416 debug2("channel %d: big input buffer %d",
417 c->self, buffer_len(&c->input)); 417 c->self, buffer_len(&c->input));
418 return 0; 418 return 0;
419 } 419 }
420#endif 420#endif
421 if (buffer_len(&c->output) > packet_get_maxsize()) { 421 if (buffer_len(&c->output) > packet_get_maxsize()) {
422 debug("channel %d: big output buffer %d > %d", 422 debug2("channel %d: big output buffer %d > %d",
423 c->self, buffer_len(&c->output), 423 c->self, buffer_len(&c->output),
424 packet_get_maxsize()); 424 packet_get_maxsize());
425 return 0; 425 return 0;