summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/cvs.c
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2007-01-11 02:35:56 +0000
committerJoris Vink <joris@cvs.openbsd.org>2007-01-11 02:35:56 +0000
commit1124f9512c12c95519a730c29ad801dc4be66469 (patch)
tree21d2d1f5da9f98a462abb6bf92d13d2bf3240ec0 /usr.bin/cvs/cvs.c
parent64f2fea116dedf51d29d29c081c572f1d47d73a4 (diff)
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/cvs.c')
-rw-r--r--usr.bin/cvs/cvs.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index 8c175eb4c32..24c2392a3d7 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: cvs.c,v 1.112 2006/12/11 10:53:00 xsa Exp $ */
+/* $OpenBSD: cvs.c,v 1.113 2007/01/11 02:35:55 joris Exp $ */
/*
- * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
+ * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
*
@@ -252,10 +252,6 @@ main(int argc, char **argv)
}
if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
- if (cvs_server_active == 1)
- fatal("remote Root while already running as server?");
-
- cvs_client_connect_to_server();
cmdp->cmd(cmd_argc, cmd_argv);
cvs_cleanup();
return (0);