Attachment 3167 Details for Bug 2892 – jump host address family patch

[patch] jump host address family patch

jump_host_addr_family.patch (text/plain), 1.21 KB, created by Pascal Jungblut on 2018-08-04 20:39:40 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Jungblut

Created: 2018-08-04 20:39:40 AEST

Size: 1.21 KB

patch

obsolete

>? jump_host_addr_family.patch
>Index: ssh.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh.c,v
>retrieving revision 1.490
>diff -u -p -u -r1.490 ssh.c
>--- ssh.c	27 Jul 2018 05:34:42 -0000	1.490
>+++ ssh.c	4 Aug 2018 10:02:32 -0000
>@@ -1158,7 +1158,7 @@ main(int ac, char **av)
> 		options.proxy_use_fdpass = 0;
> 		snprintf(port_s, sizeof(port_s), "%d", options.jump_port);
> 		xasprintf(&options.proxy_command,
>-		    "%s%s%s%s%s%s%s%s%s%s%.*s -W '[%%h]:%%p' %s",
>+                    "%s%s%s%s%s%s%s%s%s%s%s%s%.*s -W '[%%h]:%%p' %s",
> 		    sshbin,
> 		    /* Optional "-l user" argument if jump_user set */
> 		    options.jump_user == NULL ? "" : " -l ",
>@@ -1169,6 +1169,9 @@ main(int ac, char **av)
> 		    /* Optional additional jump hosts ",..." */
> 		    options.jump_extra == NULL ? "" : " -J ",
> 		    options.jump_extra == NULL ? "" : options.jump_extra,
>+                    /* Optional "-4" or "-6" argument */
>+                    options.address_family == AF_INET ? " -4" : "",
>+                    options.address_family == AF_INET6 ? " -6" : "",
> 		    /* Optional "-F" argumment if -F specified */
> 		    config == NULL ? "" : " -F ",
> 		    config == NULL ? "" : config,

Actions: View | Diff

Attachments on bug 2892: 3167