- (djm) OpenBSD CVS Sync

- markus@cvs.openbsd.org 2003/01/01 18:08:52
     [channels.c]
     move big output buffer messages to debug2
This commit is contained in:
Damien Miller 2003-01-08 14:04:09 +11:00
parent e77c17ee4a
commit 275295eb41
2 changed files with 8 additions and 4 deletions

View File

@ -1,6 +1,10 @@
20030108
- (djm) Sync openbsd-compat/ with OpenBSD -current
- (djm) Avoid redundant xstrdup/xfree in auth2-pam.c. From Solar via markus@
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/01/01 18:08:52
[channels.c]
move big output buffer messages to debug2
20030107
- (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses.
@ -946,4 +950,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
$Id: ChangeLog,v 1.2550 2003/01/08 01:37:03 djm Exp $
$Id: ChangeLog,v 1.2551 2003/01/08 03:04:09 djm Exp $

View File

@ -39,7 +39,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.184 2002/12/13 10:03:15 markus Exp $");
RCSID("$OpenBSD: channels.c,v 1.185 2003/01/01 18:08:52 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@ -413,13 +413,13 @@ channel_not_very_much_buffered_data(void)
#if 0
if (!compat20 &&
buffer_len(&c->input) > packet_get_maxsize()) {
debug("channel %d: big input buffer %d",
debug2("channel %d: big input buffer %d",
c->self, buffer_len(&c->input));
return 0;
}
#endif
if (buffer_len(&c->output) > packet_get_maxsize()) {
debug("channel %d: big output buffer %d > %d",
debug2("channel %d: big output buffer %d > %d",
c->self, buffer_len(&c->output),
packet_get_maxsize());
return 0;