D27060.id79107.diff
No OneTemporary
Actions

Size

814 B

Referenced Files

None

Subscribers

None

D27060.id79107.diff
View Options

	Index: head/sbin/ifconfig/ifmedia.c
	===================================================================
	--- head/sbin/ifconfig/ifmedia.c
	+++ head/sbin/ifconfig/ifmedia.c
	@@ -566,7 +566,7 @@
	struct ifmedia_description *desc;
	struct ifmedia_type_to_subtype *ttos;
	char optlist, optptr;
	- int option = 0, i, rval = 0;
	+ int option, i, rval = 0;

	/* We muck with the string, so copy it. */
	optlist = strdup(val);
	@@ -587,12 +587,13 @@
	*/
	optptr = optlist;
	for (; (optptr = strtok(optptr, ",")) != NULL; optptr = NULL) {
	+ option = -1;
	for (i = 0; ttos->options[i].desc != NULL; i++) {
	option = lookup_media_word(ttos->options[i].desc, optptr);
	if (option != -1)
	break;
	}
	- if (option == 0)
	+ if (option == -1)
	errx(1, "unknown option: %s", optptr);
	rval \|= option;
	}