summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-09-12 13:11:16 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-09-12 13:11:16 +0000
commitc1c05e5e58f6519f202d702f1c292b6b4e6db1fe (patch)
tree86da615dfea5195c4bbe921451fdd24013eaa4d4 /usr.bin
parentabe3ae1cc00a57bdb6ba518f1c46982b7bfea2ac (diff)
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@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/rcs.c4
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);