Attachment 3151 Details for Bug 2869 – Accept ProxyJump=none

[patch] Accept ProxyJump=none

bz2869.diff (text/plain), 1.82 KB, created by Damien Miller on 2018-05-18 10:44:08 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2018-05-18 10:44:08 AEST

Size: 1.82 KB

patch

obsolete

>commit 7db9a277b3e2fb596db7d50a97548b06121893f7
>Author: Damien Miller <djm@mindrot.org>
>Date:   Fri May 18 10:43:02 2018 +1000
>
>    bz2869
>
>diff --git a/readconf.c b/readconf.c
>index 51fb141..0035efd 100644
>--- a/readconf.c
>+++ b/readconf.c
>@@ -2055,6 +2055,12 @@ fill_default_options(Options * options)
> 	CLEAR_ON_NONE(options->proxy_command);
> 	CLEAR_ON_NONE(options->control_path);
> 	CLEAR_ON_NONE(options->revoked_host_keys);
>+	if (options->jump_host != NULL &&
>+	    strcmp(options->jump_host, "none") == 0 &&
>+	    options->jump_port == 0 && options->jump_user == NULL) {
>+		free(options->jump_host);
>+		options->jump_host = NULL;
>+	}
> 	/* options->identity_agent distinguishes NULL from 'none' */
> 	/* options->user will be set in the main program if appropriate */
> 	/* options->hostname will be set in the main program if appropriate */
>@@ -2283,6 +2289,8 @@ parse_jump(const char *s, Options *o, int active)
> 	orig = sdup = xstrdup(s);
> 	first = active;
> 	do {
>+		if (strcasecmp(s, "none") == 0)
>+			break;
> 		if ((cp = strrchr(sdup, ',')) == NULL)
> 			cp = sdup; /* last */
> 		else
>@@ -2303,14 +2311,19 @@ parse_jump(const char *s, Options *o, int active)
> 	} while (cp != sdup);
> 	/* success */
> 	if (active) {
>-		o->jump_user = user;
>-		o->jump_host = host;
>-		o->jump_port = port;
>-		o->proxy_command = xstrdup("none");
>-		user = host = NULL;
>-		if ((cp = strrchr(s, ',')) != NULL && cp != s) {
>-			o->jump_extra = xstrdup(s);
>-			o->jump_extra[cp - s] = '\0';
>+		if (strcasecmp(s, "none") == 0) {
>+			o->jump_host = xstrdup("none");
>+			o->jump_port = 0;
>+		} else {
>+			o->jump_user = user;
>+			o->jump_host = host;
>+			o->jump_port = port;
>+			o->proxy_command = xstrdup("none");
>+			user = host = NULL;
>+			if ((cp = strrchr(s, ',')) != NULL && cp != s) {
>+				o->jump_extra = xstrdup(s);
>+				o->jump_extra[cp - s] = '\0';
>+			}
> 		}
> 	}
> 	ret = 0;

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2869: 3151