diff options
| author |   angelos <angelos@openbsd.org> | 2000-01-03 19:20:30 +0000 |
|---|---|---|
| committer | angelos <angelos@openbsd.org> | 2000-01-03 19:20:30 +0000 |
| commit | 40acbda0d1a2d8ce8f666271eba61e48ddcb0259 (patch) | |
| tree | a0f032421ee91e89ed4cb9755bc874f18129c669 | |
| parent | check db_panic in kdb_trap() as well; similar to i386 fix from assar (diff) | |
| download | wireguard-openbsd-40acbda0d1a2d8ce8f666271eba61e48ddcb0259.tar.xz wireguard-openbsd-40acbda0d1a2d8ce8f666271eba61e48ddcb0259.zip | |
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.
| -rw-r--r-- | usr.sbin/config/sem.c | 6 |
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) { |