diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2014-12-22 07:24:11 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-12-22 19:06:27 +1100 |
| commit | 46ac2ed4677968224c4ca825bc98fc68dae183f0 (patch) | |
| tree | b3e92d22c349b04dbf70c8e3b73027ae546d8191 /mux.c | |
| parent | 0d1b241a262e4d0a6bbfdd595489ab1b853c43a1 (diff) | |
| download | openssh-git-46ac2ed4677968224c4ca825bc98fc68dae183f0.tar.gz | |
upstream commit
fix passing of wildcard forward bind addresses when
connection multiplexing is in use; patch from Sami Hartikainen via bz#2324;
ok dtucker@
Diffstat (limited to 'mux.c')
| -rw-r--r-- | mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.48 2014/07/17 07:22:19 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.49 2014/12/22 07:24:11 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -1689,7 +1689,8 @@ mux_client_forward(int fd, int cancel_flag, u_int ftype, struct Forward *fwd) buffer_put_cstring(&m, fwd->listen_path); } else { buffer_put_cstring(&m, - fwd->listen_host == NULL ? "" : fwd->listen_host); + fwd->listen_host == NULL ? "" : + (*fwd->listen_host == '\0' ? "*" : fwd->listen_host)); } buffer_put_int(&m, fwd->listen_port); if (fwd->connect_path != NULL) { |