Attachment #2375 for bug #1285




	oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
	oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
	oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, oUnSendEnv,
	oIgnoredUnknownOption, oDeprecated, oUnsupported
} OpCodes;


	{ "canonicalizehostname", oCanonicalizeHostname },
	{ "canonicalizemaxdots", oCanonicalizeMaxDots },
	{ "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
	{ "unsendenv", oUnSendEnv },
	{ "ignoreunknown", oIgnoreUnknown },

	{ NULL, oBadOption }

				    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;


Return to bug 1285

Lines 140-146 typedef enum { Link Here

(-)readconf.c (-1 / +22 lines)
140	oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,	140	oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
141	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,	141	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
142	oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,	142	oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
143	oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,	143	oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, oUnSendEnv,
144	oIgnoredUnknownOption, oDeprecated, oUnsupported	144	oIgnoredUnknownOption, oDeprecated, oUnsupported
145	} OpCodes;	145	} OpCodes;
146		146
Lines 259-264 static struct { Link Here
259	{ "canonicalizehostname", oCanonicalizeHostname },	259	{ "canonicalizehostname", oCanonicalizeHostname },
260	{ "canonicalizemaxdots", oCanonicalizeMaxDots },	260	{ "canonicalizemaxdots", oCanonicalizeMaxDots },
261	{ "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },	261	{ "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
		262	{ "unsendenv", oUnSendEnv },
262	{ "ignoreunknown", oIgnoreUnknown },	263	{ "ignoreunknown", oIgnoreUnknown },
263		264
264	{ NULL, oBadOption }	265	{ NULL, oBadOption }
Lines 1224-1229 parse_int: Link Here
1224	filename, linenum);	1225	filename, linenum);
1225	options->send_env[options->num_send_env++] =	1226	options->send_env[options->num_send_env++] =
1226	xstrdup(arg);	1227	xstrdup(arg);
		1228	}
		1229	break;
		1230
		1231	case oUnSendEnv:
		1232	while ((arg = strdelim(&s)) != NULL && *arg != '\0') {
		1233	if (!*activep)
		1234	continue;
		1235	for (i = 0; (int)i < options->num_send_env; i++) {
		1236	if (match_pattern_list(options->send_env[i],
		1237	arg, strlen(arg), 0) != 1)
		1238	continue;
		1239	/* Delete this environment variable */
		1240	debug("Deleting SendEnv %s",
		1241	options->send_env[i]);
		1242	free(options->send_env[i]);
		1243	memmove(options->send_env + i,
		1244	options->send_env + i + 1,
		1245	(--options->num_send_env - i) *
		1246	sizeof(*options->send_env));
		1247	}
1227	}	1248	}
1228	break;	1249	break;
1229		1250