diff options
Diffstat (limited to 'serverloop.c')
-rw-r--r-- | serverloop.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/serverloop.c b/serverloop.c index 8b1ee9919..66bc52573 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.54 2001/03/04 01:46:30 djm Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.55 2001/03/16 19:06:29 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -756,11 +756,6 @@ server_request_direct_tcpip(char *ctype) | |||
756 | originator, originator_port, target, target_port); | 756 | originator, originator_port, target, target_port); |
757 | 757 | ||
758 | /* XXX check permission */ | 758 | /* XXX check permission */ |
759 | if (no_port_forwarding_flag || !options.allow_tcp_forwarding) { | ||
760 | xfree(target); | ||
761 | xfree(originator); | ||
762 | return NULL; | ||
763 | } | ||
764 | sock = channel_connect_to(target, target_port); | 759 | sock = channel_connect_to(target, target_port); |
765 | xfree(target); | 760 | xfree(target); |
766 | xfree(originator); | 761 | xfree(originator); |
@@ -858,6 +853,7 @@ server_input_global_request(int type, int plen, void *ctxt) | |||
858 | want_reply = packet_get_char(); | 853 | want_reply = packet_get_char(); |
859 | debug("server_input_global_request: rtype %s want_reply %d", rtype, want_reply); | 854 | debug("server_input_global_request: rtype %s want_reply %d", rtype, want_reply); |
860 | 855 | ||
856 | /* -R style forwarding */ | ||
861 | if (strcmp(rtype, "tcpip-forward") == 0) { | 857 | if (strcmp(rtype, "tcpip-forward") == 0) { |
862 | struct passwd *pw; | 858 | struct passwd *pw; |
863 | char *listen_address; | 859 | char *listen_address; |