2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a6228a48..bdc7acca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - djm@cvs.openbsd.org 2014/07/03 23:18:35
      [authfile.h]
      remove leakmalloc droppings
+   - djm@cvs.openbsd.org 2014/07/05 23:11:48
+     [channels.c]
+     fix remote-forward cancel regression; ok markus@
 
 20140704
  - OpenBSD CVS Sync
diff --git a/channels.c b/channels.c
index dc69d8072..dcd75346b 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;