openssh unix dev - Jul 2014 - multiplex.sh fails in make tests

Hello everybody,

running make tests on latest openssh-portable git master
(V_6_6_P1-114-g72e6b5c) fails:

[...]
run test multiplex.sh ...
test connection multiplexing: envpass
test connection multiplexing: transfer
test connection multiplexing: status 0
test connection multiplexing: status 1
test connection multiplexing: status 4
test connection multiplexing: status 5
test connection multiplexing: status 44
test connection multiplexing: cmd check
test connection multiplexing: cmd forward local
test connection multiplexing: cmd forward remote
remote forward port still listening
test connection multiplexing: cmd exit
test connection multiplexing: cmd stop
failed connection multiplexing
Makefile:168: recipe for target 't-exec' failed
make[1]: *** [t-exec] Error 1

Let me know if you need any more details.
-- 
main(a){char*c=/*    Schoene Gruesse                        
*/"B?IJj;MEH"
"CX:;",b;for(a/*    Chris           get my mail address:   
*/=0;b=c[a++];)
putchar(b-1/(/*               gcc -o sig sig.c && ./sig   
*/b/42*2-3)*42);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL:
<http://lists.mindrot.org/pipermail/openssh-unix-dev/attachments/20140704/34751ebf/attachment.bin>

On Fri, 4 Jul 2014, Christian Hesse wrote:
> Hello everybody,
> 
> running make tests on latest openssh-portable git master
> (V_6_6_P1-114-g72e6b5c) fails:
Yes, I've been trying to figure that out myself. I think this is the fix:

diff --git channels.c channels.c
index eb63325..a858ac2 100644
--- channels.c
+++ channels.c
@@ -3073,7 +3073,8 @@ channel_request_rforward_cancel(const char *host, u_short
port)
 		return -1;
 
 	for (i = 0; i < num_permitted_opens; i++) {
-		if (open_listen_match(&permitted_opens[i], host, port, 0))
+		if (open_listen_match(&permitted_opens[i],
+		    channel_rfwd_bind_host(host), port, 1))
 			break;
 	}
 	if (i >= num_permitted_opens) {