upstream commit

fix passing of wildcard forward bind addresses when
 connection multiplexing is in use; patch from Sami Hartikainen via bz#2324;
 ok dtucker@
This commit is contained in:
djm@openbsd.org 2014-12-22 07:24:11 +00:00 committed by Damien Miller
parent 0d1b241a26
commit 46ac2ed467
1 changed files with 3 additions and 2 deletions

5
mux.c
View File

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