tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2014/07/05 23:11:48 

[channels.c]
     fix remote-forward cancel regression; ok markus@
This commit is contained in:
Damien Miller 2014-07-06 09:32:49 +10:00
parent 48bae3a38c
commit 3a48cc0900
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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

5
channels.c
View File

@ -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;