summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/diff.c
diff options
context:
space:
mode:
authorjoris <joris@openbsd.org>2007-01-11 02:35:55 +0000
committerjoris <joris@openbsd.org>2007-01-11 02:35:55 +0000
commit80f6ca9b2ba9c07b064035e81071590756ef3e37 (patch)
tree27bb21a53cc64adc0501a93cf11c7c87df43b145 /usr.bin/cvs/diff.c
parentremove unused #define DHCP_MIN_LEN (diff)
downloadwireguard-openbsd-80f6ca9b2ba9c07b064035e81071590756ef3e37.tar.xz
wireguard-openbsd-80f6ca9b2ba9c07b064035e81071590756ef3e37.zip
in a remote setup:
do not connect to the remote server until we are sure all the options passed to the commands are valid. noticed by xsa@
Diffstat (limited to 'usr.bin/cvs/diff.c')
-rw-r--r--usr.bin/cvs/diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 843a6f45ed3..5cc4e62b77a 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.109 2006/07/08 09:25:44 ray Exp $ */
+/* $OpenBSD: diff.c,v 1.110 2007/01/11 02:35:55 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -97,6 +97,7 @@ cvs_diff(int argc, char **argv)
cr.leavedir = NULL;
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
+ cvs_client_connect_to_server();
cr.fileproc = cvs_client_sendfile;
if (!(flags & CR_RECURSE_DIRS))