summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2000-01-08 14:34:50 +0000
committerbde <bde@FreeBSD.org>2000-01-08 14:34:50 +0000
commit3aad71b6b47d45903ffa2a7af4e05f85167cbc39 (patch)
tree4c0b487e5b9bc73e6460970cef4e7e182b24e075
parent3b5615c3f382bc8fdfe34e8acf4da89524464e09 (diff)
downloadFreeBSD-src-3aad71b6b47d45903ffa2a7af4e05f85167cbc39.zip
FreeBSD-src-3aad71b6b47d45903ffa2a7af4e05f85167cbc39.tar.gz
Fixed removal of unknown options. For options files with only a single
known option, unknown options following the known option were not removed. Now I think only unknown options in unknown options files are not removed. This is harmless because unknown options files should not be used, but removing the files would be cleaner.
-rw-r--r--usr.sbin/config/mkoptions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index 89af213..a6f44eb 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -194,7 +194,7 @@ do_option(name)
for (ol = otab; ol != 0; ol = ol->o_next)
if (eq(inw, ol->o_name))
break;
- if (!seen && !ol) {
+ if (!eq(inw, name) && !ol) {
printf("WARNING: unknown option `%s' removed from %s\n",
inw, file);
tidy++;
OpenPOWER on IntegriCloud