summaryrefslogtreecommitdiffstats
path: root/channels.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-06 09:32:49 +1000
committerDamien Miller <djm@mindrot.org>2014-07-06 09:32:49 +1000
commit3a48cc090096cf99b9de592deb5f90e444edebfb (patch)
treef2d3218ec2ac3e346f3b674708dba7419f00c6e5 /channels.c
parent48bae3a38cb578713e676708164f6e7151cc64fa (diff)
- djm@cvs.openbsd.org 2014/07/05 23:11:48
[channels.c] fix remote-forward cancel regression; ok markus@
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/channels.c b/channels.c
index dc69d807..dcd75346 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.334 2014/07/03 22:33:41 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.335 2014/07/05 23:11:48 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3082,6 +3082,9 @@ open_listen_match(ForwardPermission *allowed_open, const char *requestedhost,
return 0;
if (allowed_open->listen_port != requestedport)
return 0;
+ if (!translate && allowed_open->listen_host == NULL &&
+ requestedhost == NULL)
+ return 1;
allowed_host = translate ?
channel_rfwd_bind_host(allowed_open->listen_host) :
allowed_open->listen_host;