summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoris <joris@openbsd.org>2018-07-14 21:28:02 +0000
committerjoris <joris@openbsd.org>2018-07-14 21:28:02 +0000
commit2314050ca45d4a0007c6eb162a1d04111bb55a03 (patch)
tree261a39588993d16c31db87cfe665b2ee334faaef
parentDocument that route monitor also takes -T rtable as an argument. (diff)
downloadwireguard-openbsd-2314050ca45d4a0007c6eb162a1d04111bb55a03.tar.xz
wireguard-openbsd-2314050ca45d4a0007c6eb162a1d04111bb55a03.zip
don't run cvs_client_sendfile() if its file_type is CVS_DIR, but do not
depend on it being CVS_FILE explicitly. unbreaks remote operations on removed files.
-rw-r--r--usr.bin/cvs/client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c
index 56dafef8e01..972184e8ecb 100644
--- a/usr.bin/cvs/client.c
+++ b/usr.bin/cvs/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.127 2017/08/21 16:45:13 millert Exp $ */
+/* $OpenBSD: client.c,v 1.128 2018/07/14 21:28:02 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -458,7 +458,7 @@ cvs_client_sendfile(struct cvs_file *cf)
cvs_client_senddir(cf->file_wd);
cvs_remote_classify_file(cf);
- if (cf->file_type != CVS_FILE)
+ if (cf->file_type == CVS_DIR)
return;
if (cf->file_ent != NULL && cvs_cmdop != CVS_OP_IMPORT) {