Attachment 2514 Details for Bug 2324 – Patch making empty bind_address via mux behave as per documentation

[patch] Patch making empty bind_address via mux behave as per documentation

0001-Fix-forward-request-from-a-MUX-slave-with-an-empty-b.patch (text/plain), 1.19 KB, created by Sami Hartikainen on 2014-12-05 00:24:29 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sami Hartikainen

Created: 2014-12-05 00:24:29 AEDT

Size: 1.19 KB

patch

obsolete

>From fdd7da6761168e7cf70a6153296e582b8e01744c Mon Sep 17 00:00:00 2001
>From: Sami Hartikainen <sami.hartikainen@teleste.com>
>Date: Fri, 19 Sep 2014 10:56:59 +0300
>Subject: [PATCH] Fix forward request from a MUX slave with an empty
> bind_address
>
>The (optional) bind_address in forward specification may be an empty
>string or a '*', which should result in a wildcard bind. When given
>via a MUX slave ssh client, the empty bind_address did not work.
>
>The fix is to replace the empty bind_address with an explicit '*'
>address, allowing MUX master to distinguish it from an unset one
>(which looked like an empty string due to sshbuf shortcomings).
>---
> mux.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/mux.c b/mux.c
>index 48f7a05..f6ac30c 100644
>--- a/mux.c
>+++ b/mux.c
>@@ -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) {
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 2324: 2514