diff options
| author |   markus <markus@openbsd.org> | 2014-06-27 16:41:56 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2014-06-27 16:41:56 +0000 |
| commit | f7ab312325305bcdb84d0903fe8fd84c4e3e7aa0 (patch) | |
| tree | cf2cc38d91000082904fa7957b3434cfd7e5606a /usr.bin/ssh/ssh.c | |
| parent | Do not KASSERT an unsigned value being >= 0 after decrementing it; instead, (diff) | |
| download | wireguard-openbsd-f7ab312325305bcdb84d0903fe8fd84c4e3e7aa0.tar.xz wireguard-openbsd-f7ab312325305bcdb84d0903fe8fd84c4e3e7aa0.zip | |
fix remote fwding with same listen port but different listen address
with gerhard@, ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 2a1529d67c5..17f6363a236 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.403 2014/06/24 02:19:48 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.404 2014/06/27 16:41:56 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1231,8 +1231,10 @@ ssh_confirm_remote_forward(int type, u_int32_t seq, void *ctxt) Forward *rfwd = (Forward *)ctxt; /* XXX verbose() on failure? */ - debug("remote forward %s for: listen %d, connect %s:%d", + debug("remote forward %s for: listen %s%s%d, connect %s:%d", type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure", + rfwd->listen_host == NULL ? "" : rfwd->listen_host, + rfwd->listen_host == NULL ? "" : ":", rfwd->listen_port, rfwd->connect_host, rfwd->connect_port); if (rfwd->listen_port == 0) { if (type == SSH2_MSG_REQUEST_SUCCESS) { |