diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | channels.c | 7 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20010511 | ||
2 | - OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2001/05/09 22:51:57 | ||
4 | [channels.c] | ||
5 | fix -R for protocol 2, noticed by greg@nest.cx. | ||
6 | bug was introduced with experimental dynamic forwarding. | ||
7 | |||
1 | 20010509 | 8 | 20010509 |
2 | - OpenBSD CVS Sync | 9 | - OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2001/05/06 21:23:31 | 10 | - markus@cvs.openbsd.org 2001/05/06 21:23:31 |
@@ -5384,4 +5391,4 @@ | |||
5384 | - Wrote replacements for strlcpy and mkdtemp | 5391 | - Wrote replacements for strlcpy and mkdtemp |
5385 | - Released 1.0pre1 | 5392 | - Released 1.0pre1 |
5386 | 5393 | ||
5387 | $Id: ChangeLog,v 1.1214 2001/05/09 00:38:19 mouring Exp $ | 5394 | $Id: ChangeLog,v 1.1215 2001/05/10 23:24:49 mouring Exp $ |
diff --git a/channels.c b/channels.c index 0f3d9ca97..9397d48e5 100644 --- a/channels.c +++ b/channels.c | |||
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: channels.c,v 1.114 2001/05/08 19:17:30 markus Exp $"); | 43 | RCSID("$OpenBSD: channels.c,v 1.115 2001/05/09 22:51:57 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/rsa.h> | 45 | #include <openssl/rsa.h> |
46 | #include <openssl/dsa.h> | 46 | #include <openssl/dsa.h> |
@@ -771,8 +771,9 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset) | |||
771 | 771 | ||
772 | rtype = (c->type == SSH_CHANNEL_RPORT_LISTENER) ? | 772 | rtype = (c->type == SSH_CHANNEL_RPORT_LISTENER) ? |
773 | "forwarded-tcpip" : "direct-tcpip"; | 773 | "forwarded-tcpip" : "direct-tcpip"; |
774 | nextstate = (c->host_port == 0) ? SSH_CHANNEL_DYNAMIC : | 774 | nextstate = (c->host_port == 0 && |
775 | SSH_CHANNEL_OPENING; | 775 | c->type != SSH_CHANNEL_RPORT_LISTENER) ? |
776 | SSH_CHANNEL_DYNAMIC : SSH_CHANNEL_OPENING; | ||
776 | 777 | ||
777 | addrlen = sizeof(addr); | 778 | addrlen = sizeof(addr); |
778 | newsock = accept(c->sock, &addr, &addrlen); | 779 | newsock = accept(c->sock, &addr, &addrlen); |