summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2008-07-09 23:59:45 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2008-07-09 23:59:45 +0000
commit4215a8cc00d5c282901a32bdaa22ecaf9075692e (patch)
tree9ca1ac825b015a02943d8173170d8339269d0a3d
parenta6009e4aa7fd42cc4393725381cd524cb5f0dd19 (diff)
Read 'vendor' flag from ASCII disklabel since we print it. Fixes
PR #5872. ok millert@ deraadt@
-rw-r--r--sbin/disklabel/disklabel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 92507bbf8a0..ac7f7450108 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.c,v 1.131 2008/07/01 04:08:53 ray Exp $ */
+/* $OpenBSD: disklabel.c,v 1.132 2008/07/09 23:59:44 krw Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -39,7 +39,7 @@ static const char copyright[] =
#endif /* not lint */
#ifndef lint
-static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.131 2008/07/01 04:08:53 ray Exp $";
+static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.132 2008/07/09 23:59:44 krw Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -1213,6 +1213,8 @@ getasciilabel(FILE *f, struct disklabel *lp)
tp = word(cp);
if (!strcmp(cp, "badsect"))
v |= D_BADSECT;
+ else if (!strcmp(cp, "vendor"))
+ v |= D_VENDOR;
else {
warnx("line %d: bad flag: %s",
lineno, cp);