diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2014-07-05 23:11:49 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2014-07-05 23:11:49 +0000 |
| commit | 4aa0b086cfa4b91bee4edef283fc98dcdc1594b0 (patch) | |
| tree | b6a8e42217b6a4be479e64b74e7089172e97145d | |
| parent | d5b068859836b6c02879ba4b64e9b6e46568ff3f (diff) | |
fix remote-forward cancel regression; ok markus@
| -rw-r--r-- | usr.bin/ssh/channels.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index eb63325afd9..8cd8c155dea 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/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 @@ -3051,6 +3051,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; |