- markus@cvs.openbsd.org 2001/10/04 15:05:40
[channels.c serverloop.c]
comment out bogus conditions for selecting on connection_in
diff --git a/ChangeLog b/ChangeLog
index 9c8dc92..8970ba1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
- markus@cvs.openbsd.org 2001/10/04 14:34:16
[key.c]
call OPENSSL_free() for memory allocated by openssl; from chombier@mac.com
+ - markus@cvs.openbsd.org 2001/10/04 15:05:40
+ [channels.c serverloop.c]
+ comment out bogus conditions for selecting on connection_in
20011007
- (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys.
@@ -6648,4 +6651,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1585 2001/10/10 05:00:49 djm Exp $
+$Id: ChangeLog,v 1.1586 2001/10/10 05:01:16 djm Exp $
diff --git a/channels.c b/channels.c
index 12affdc..758ea50 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.135 2001/10/01 21:38:53 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.136 2001/10/04 15:05:40 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -429,14 +429,18 @@
for (i = 0; i < channels_alloc; i++) {
c = channels[i];
if (c != NULL && c->type == SSH_CHANNEL_OPEN) {
- if (!compat20 && buffer_len(&c->input) > packet_get_maxsize()) {
+#if 0
+ if (!compat20 &&
+ buffer_len(&c->input) > packet_get_maxsize()) {
debug("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",
- c->self, buffer_len(&c->output));
+ debug("channel %d: big output buffer %d > %d",
+ c->self, buffer_len(&c->output),
+ packet_get_maxsize());
return 0;
}
}
diff --git a/serverloop.c b/serverloop.c
index d6089d8..049ea4e 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.77 2001/09/17 21:04:02 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.78 2001/10/04 15:05:40 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
@@ -196,9 +196,11 @@
channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, 0);
if (compat20) {
+#if 0
/* wrong: bad condition XXX */
if (channel_not_very_much_buffered_data())
- FD_SET(connection_in, *readsetp);
+#endif
+ FD_SET(connection_in, *readsetp);
} else {
/*
* Read packets from the client unless we have too much