diff options
| author |   tobias <tobias@openbsd.org> | 2008-09-12 13:11:15 +0000 |
|---|---|---|
| committer | tobias <tobias@openbsd.org> | 2008-09-12 13:11:15 +0000 |
| commit | feca7f66fb14d7d1576bd719ea47b0915595341d (patch) | |
| tree | 11f3d86c058527b3de113d28b9afd16cbde33f8b | |
| parent | just like v4 icmp, icmp6 recycles mbufs so we need to call (diff) | |
| download | wireguard-openbsd-feca7f66fb14d7d1576bd719ea47b0915595341d.tar.xz wireguard-openbsd-feca7f66fb14d7d1576bd719ea47b0915595341d.zip | |
Be very conservative about state changes with "admin -s". With GNU CVS
and current OpenCVS code it's possible to change a state in a way that
cannot be fixed with another admin call.
No objections xsa@
| -rw-r--r-- | usr.bin/cvs/rcs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index e8f4883a2ab..69c28196f4c 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.278 2008/06/26 21:31:40 joris Exp $ */ +/* $OpenBSD: rcs.c,v 1.279 2008/09/12 13:11:15 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -2608,7 +2608,7 @@ rcs_state_set(RCSFILE *rfp, RCSNUM *rev, const char *state) int rcs_state_check(const char *state) { - if (strchr(state, ' ') != NULL) + if (strcmp(state, RCS_STATE_DEAD) && strcmp(state, RCS_STATE_EXP)) return (-1); return (0); |