summaryrefslogtreecommitdiff
path: root/usr.sbin/config
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2000-01-03 19:20:31 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2000-01-03 19:20:31 +0000
commit6178de85dc1c74699911e0bd379b09e7a09b6cb2 (patch)
tree18c00dede29dae97ed9490eb6c73bcdd53386e61 /usr.sbin/config
parentbe22ae4aff0f2b55933a8e1fbdde00846afc863e (diff)
Allow for duplicate maxusers definitions (so one can include a GENERIC
and use a different value). config will print a warning that there has been a duplicate entry, and will use the second definition. More generally, config will end up using the last maxusers definition in the config file.
Diffstat (limited to 'usr.sbin/config')
-rw-r--r--usr.sbin/config/sem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index a9a00984b25..fc42c2db610 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.c,v 1.14 1999/04/18 17:15:09 espie Exp $ */
+/* $OpenBSD: sem.c,v 1.15 2000/01/03 19:20:30 angelos Exp $ */
/* $NetBSD: sem.c,v 1.10 1996/11/11 23:40:11 gwr Exp $ */
/*
@@ -165,8 +165,8 @@ setmaxusers(n)
{
if (maxusers != 0) {
- error("duplicate maxusers parameter");
- return;
+ error("warning: duplicate maxusers parameter, will use latest definition (%d)", n);
+ errors--; /* take it away */
}
maxusers = n;
if (n < minmaxusers) {