View | Details | Raw Unified | Return to bug 2414
Collapse All | Expand All

(-)a/readconf.c (-3 / +10 lines)
Lines 647-659 parse_token(const char *cp, const char *filename, int linenum, Link Here
647
    const char *ignored_unknown)
649
    const char *ignored_unknown)
648
{
650
{
649
	int i;
651
	int i;
652
	OpCodes r = oBadOption;
650
653
651
	for (i = 0; keywords[i].name; i++)
654
	for (i = 0; keywords[i].name; i++) {
652
		if (strcmp(cp, keywords[i].name) == 0)
655
		if (strcmp(cp, keywords[i].name) == 0) {
653
			return keywords[i].opcode;
656
			if ((r = keywords[i].opcode) != oUnsupported)
657
				return r;
658
			break;
659
		}
660
	}
654
	if (ignored_unknown != NULL &&
661
	if (ignored_unknown != NULL &&
655
	    match_pattern_list(cp, ignored_unknown, 1) == 1)
662
	    match_pattern_list(cp, ignored_unknown, 1) == 1)
656
		return oIgnoredUnknownOption;
663
		return oIgnoredUnknownOption;
664
	if (r == oUnsupported)
665
		return r;
657
	error("%s: line %d: Bad configuration option: %s",
666
	error("%s: line %d: Bad configuration option: %s",
658
	    filename, linenum, cp);
667
	    filename, linenum, cp);
659
	return oBadOption;
668
	return oBadOption;

Return to bug 2414