Attachment 2375 Details for Bug 1285 – Add UnSendEnv option

[patch] Add UnSendEnv option

unsendenv.diff (text/plain), 1.71 KB, created by Damien Miller on 2013-11-16 02:03:24 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2013-11-16 02:03:24 AEDT

Size: 1.71 KB

patch

obsolete

>Index: readconf.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/readconf.c,v
>retrieving revision 1.213
>diff -u -p -r1.213 readconf.c
>--- readconf.c	24 Oct 2013 00:51:48 -0000	1.213
>+++ readconf.c	15 Nov 2013 10:48:30 -0000
>@@ -140,7 +140,7 @@ typedef enum {
> 	oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
> 	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
> 	oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
>-	oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
>+	oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, oUnSendEnv,
> 	oIgnoredUnknownOption, oDeprecated, oUnsupported
> } OpCodes;
> 
>@@ -259,6 +259,7 @@ static struct {
> 	{ "canonicalizehostname", oCanonicalizeHostname },
> 	{ "canonicalizemaxdots", oCanonicalizeMaxDots },
> 	{ "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
>+	{ "unsendenv", oUnSendEnv },
> 	{ "ignoreunknown", oIgnoreUnknown },
> 
> 	{ NULL, oBadOption }
>@@ -1224,6 +1225,26 @@ parse_int:
> 				    filename, linenum);
> 			options->send_env[options->num_send_env++] =
> 			    xstrdup(arg);
>+		}
>+		break;
>+
>+	case oUnSendEnv:
>+		while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
>+			if (!*activep)
>+				continue;
>+			for (i = 0; (int)i < options->num_send_env; i++) {
>+				if (match_pattern_list(options->send_env[i],
>+				    arg, strlen(arg), 0) != 1)
>+					continue;
>+				/* Delete this environment variable */
>+				debug("Deleting SendEnv %s",
>+				    options->send_env[i]);
>+				free(options->send_env[i]);
>+				memmove(options->send_env + i,
>+				    options->send_env + i + 1,
>+				    (--options->num_send_env - i) *
>+				    sizeof(*options->send_env));
>+			}
> 		}
> 		break;
>

Actions: View | Diff

Attachments on bug 1285: 2336 | 2375 | 3138 | 3139