f8f93b3 Make unkown keyword fatal — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Make unkown keyword fatal

Baptiste Daroussin committed 11 years ago

commit f8f93b3e35929262f3cf385f003c39780647f56d
parent 44d3488

2 files changed +4 -2

modified libpkg/pkg_ports.c

@@ -1045,9 +1045,8 @@ plist_parse_line(struct pkg *pkg, struct plist *plist, char *line)

 		switch (parse_keywords(plist, keyword, buf)) {
 		case EPKG_UNKNOWN:
 			pkg_emit_error("unknown keyword %s, ignoring %s",
 			pkg_emit_error("unknown keyword %s: %s",
 			    keyword, line);
 				return (EPKG_OK);
 		case EPKG_FATAL:
 			return (EPKG_FATAL);
 		}

modified tests/lib/plist.c

@@ -119,6 +119,9 @@ ATF_TC_BODY(parse_plist, tc)

 	ATF_REQUIRE_EQ(EPKG_OK, plist_parse_line(p, plist, buf));
 	ATF_REQUIRE_EQ(0, plist->perm);
 	strlcpy(buf, "@blabla", BUFSIZ);
 	ATF_REQUIRE_EQ(EPKG_FATAL, plist_parse_line(p, plist, buf));
 	pkg_free(p);
 	plist_free(plist);
 }