summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-17 00:47:54 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-17 00:47:54 +0000
commit7bb8b49596156b85df403d09c2195e2533ec372c (patch)
treee6bc23a1a38a24e4bc5438695300a37a913dcb17 /serverloop.c
parentcf00df63443b40190d3f88c5f0a7e102540d0cac (diff)
- markus@cvs.openbsd.org 2001/03/16 19:06:30
[auth-options.c channels.c channels.h serverloop.c session.c] implement "permitopen" key option, restricts -L style forwarding to to specified host:port pairs. based on work by harlan@genua.de
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/serverloop.c b/serverloop.c
index 8b1ee991..66bc5257 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.54 2001/03/04 01:46:30 djm Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.55 2001/03/16 19:06:29 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
@@ -756,11 +756,6 @@ server_request_direct_tcpip(char *ctype)
originator, originator_port, target, target_port);
/* XXX check permission */
- if (no_port_forwarding_flag || !options.allow_tcp_forwarding) {
- xfree(target);
- xfree(originator);
- return NULL;
- }
sock = channel_connect_to(target, target_port);
xfree(target);
xfree(originator);
@@ -858,6 +853,7 @@ server_input_global_request(int type, int plen, void *ctxt)
want_reply = packet_get_char();
debug("server_input_global_request: rtype %s want_reply %d", rtype, want_reply);
+ /* -R style forwarding */
if (strcmp(rtype, "tcpip-forward") == 0) {
struct passwd *pw;
char *listen_address;