diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 12 | ||||
-rw-r--r-- | serverloop.c | 6 |
3 files changed, 16 insertions, 7 deletions
@@ -3,6 +3,9 @@ | |||
3 | - markus@cvs.openbsd.org 2001/10/04 14:34:16 | 3 | - markus@cvs.openbsd.org 2001/10/04 14:34:16 |
4 | [key.c] | 4 | [key.c] |
5 | call OPENSSL_free() for memory allocated by openssl; from chombier@mac.com | 5 | call OPENSSL_free() for memory allocated by openssl; from chombier@mac.com |
6 | - markus@cvs.openbsd.org 2001/10/04 15:05:40 | ||
7 | [channels.c serverloop.c] | ||
8 | comment out bogus conditions for selecting on connection_in | ||
6 | 9 | ||
7 | 20011007 | 10 | 20011007 |
8 | - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. | 11 | - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. |
@@ -6648,4 +6651,4 @@ | |||
6648 | - Wrote replacements for strlcpy and mkdtemp | 6651 | - Wrote replacements for strlcpy and mkdtemp |
6649 | - Released 1.0pre1 | 6652 | - Released 1.0pre1 |
6650 | 6653 | ||
6651 | $Id: ChangeLog,v 1.1585 2001/10/10 05:00:49 djm Exp $ | 6654 | $Id: ChangeLog,v 1.1586 2001/10/10 05:01:16 djm Exp $ |
diff --git a/channels.c b/channels.c index 12affdc34..758ea506d 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.135 2001/10/01 21:38:53 markus Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.136 2001/10/04 15:05:40 markus Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -429,14 +429,18 @@ channel_not_very_much_buffered_data() | |||
429 | for (i = 0; i < channels_alloc; i++) { | 429 | for (i = 0; i < channels_alloc; i++) { |
430 | c = channels[i]; | 430 | c = channels[i]; |
431 | if (c != NULL && c->type == SSH_CHANNEL_OPEN) { | 431 | if (c != NULL && c->type == SSH_CHANNEL_OPEN) { |
432 | if (!compat20 && buffer_len(&c->input) > packet_get_maxsize()) { | 432 | #if 0 |
433 | if (!compat20 && | ||
434 | buffer_len(&c->input) > packet_get_maxsize()) { | ||
433 | debug("channel %d: big input buffer %d", | 435 | debug("channel %d: big input buffer %d", |
434 | c->self, buffer_len(&c->input)); | 436 | c->self, buffer_len(&c->input)); |
435 | return 0; | 437 | return 0; |
436 | } | 438 | } |
439 | #endif | ||
437 | if (buffer_len(&c->output) > packet_get_maxsize()) { | 440 | if (buffer_len(&c->output) > packet_get_maxsize()) { |
438 | debug("channel %d: big output buffer %d", | 441 | debug("channel %d: big output buffer %d > %d", |
439 | c->self, buffer_len(&c->output)); | 442 | c->self, buffer_len(&c->output), |
443 | packet_get_maxsize()); | ||
440 | return 0; | 444 | return 0; |
441 | } | 445 | } |
442 | } | 446 | } |
diff --git a/serverloop.c b/serverloop.c index d6089d822..049ea4e46 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.77 2001/09/17 21:04:02 markus Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.78 2001/10/04 15:05:40 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -196,9 +196,11 @@ retry_select: | |||
196 | channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, 0); | 196 | channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, 0); |
197 | 197 | ||
198 | if (compat20) { | 198 | if (compat20) { |
199 | #if 0 | ||
199 | /* wrong: bad condition XXX */ | 200 | /* wrong: bad condition XXX */ |
200 | if (channel_not_very_much_buffered_data()) | 201 | if (channel_not_very_much_buffered_data()) |
201 | FD_SET(connection_in, *readsetp); | 202 | #endif |
203 | FD_SET(connection_in, *readsetp); | ||
202 | } else { | 204 | } else { |
203 | /* | 205 | /* |
204 | * Read packets from the client unless we have too much | 206 | * Read packets from the client unless we have too much |