summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--channels.c5
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 @@
3 - djm@cvs.openbsd.org 2014/07/03 23:18:35 3 - djm@cvs.openbsd.org 2014/07/03 23:18:35
4 [authfile.h] 4 [authfile.h]
5 remove leakmalloc droppings 5 remove leakmalloc droppings
6 - djm@cvs.openbsd.org 2014/07/05 23:11:48
7 [channels.c]
8 fix remote-forward cancel regression; ok markus@
6 9
720140704 1020140704
8 - OpenBSD CVS Sync 11 - 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 @@
1/* $OpenBSD: channels.c,v 1.334 2014/07/03 22:33:41 djm Exp $ */ 1/* $OpenBSD: channels.c,v 1.335 2014/07/05 23:11:48 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -3082,6 +3082,9 @@ open_listen_match(ForwardPermission *allowed_open, const char *requestedhost,
3082 return 0; 3082 return 0;
3083 if (allowed_open->listen_port != requestedport) 3083 if (allowed_open->listen_port != requestedport)
3084 return 0; 3084 return 0;
3085 if (!translate && allowed_open->listen_host == NULL &&
3086 requestedhost == NULL)
3087 return 1;
3085 allowed_host = translate ? 3088 allowed_host = translate ?
3086 channel_rfwd_bind_host(allowed_open->listen_host) : 3089 channel_rfwd_bind_host(allowed_open->listen_host) :
3087 allowed_open->listen_host; 3090 allowed_open->listen_host;