summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortobias <tobias@openbsd.org>2008-02-05 21:49:29 +0000
committertobias <tobias@openbsd.org>2008-02-05 21:49:29 +0000
commitcef0f13719566d91f62f006f2da4e3a47f077c54 (patch)
tree7c8adb1d2ca04bad836378936c8156d9c1a05f29
parentAdded change for debugging setbufint (diff)
downloadwireguard-openbsd-cef0f13719566d91f62f006f2da4e3a47f077c54.tar.xz
wireguard-openbsd-cef0f13719566d91f62f006f2da4e3a47f077c54.zip
When server sends CheckedIn use the supplied option and tag -- not the
one already in our CVS/Entries. OK xsa@
-rw-r--r--usr.bin/cvs/client.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c
index 0824f4cdb36..52faeebeb49 100644
--- a/usr.bin/cvs/client.c
+++ b/usr.bin/cvs/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.99 2008/02/03 18:18:44 tobias Exp $ */
+/* $OpenBSD: client.c,v 1.100 2008/02/05 21:49:29 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -639,8 +639,7 @@ cvs_client_checkedin(char *data)
if (newent->ce_tag != NULL)
(void)xsnprintf(sticky, sizeof(sticky), "T%s",
- ent->ce_tag);
- newent->ce_opts = ent->ce_opts;
+ newent->ce_tag);
cvs_ent_free(ent);
}