From owner-freebsd-bugs@FreeBSD.ORG Wed Apr 21 20:20:15 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74F6116A4CF for ; Wed, 21 Apr 2004 20:20:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5456443D4C for ; Wed, 21 Apr 2004 20:20:15 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i3M3KFbv077853 for ; Wed, 21 Apr 2004 20:20:15 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i3M3KFhF077852; Wed, 21 Apr 2004 20:20:15 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 21 Apr 2004 20:20:15 -0700 (PDT) Resent-Message-Id: <200404220320.i3M3KFhF077852@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mark Andrews Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D697116A4CE for ; Wed, 21 Apr 2004 20:12:17 -0700 (PDT) Received: from farside.isc.org (farside.isc.org [204.152.187.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4DE143D41 for ; Wed, 21 Apr 2004 20:12:17 -0700 (PDT) (envelope-from Mark_Andrews@isc.org) Received: from drugs.dv.isc.org (localhost [IPv6:::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by farside.isc.org (Postfix) with ESMTP id 83229A864 for ; Thu, 22 Apr 2004 03:12:12 +0000 (UTC) (envelope-from marka@isc.org) Received: from drugs.dv.isc.org (localhost [127.0.0.1]) by drugs.dv.isc.org (8.12.10/8.12.10) with ESMTP id i3M3C5eu099188 for ; Thu, 22 Apr 2004 13:12:05 +1000 (EST) (envelope-from marka@drugs.dv.isc.org) Received: (from marka@localhost) by drugs.dv.isc.org (8.12.10/8.12.10/Submit) id i3M3C4T1099187; Thu, 22 Apr 2004 13:12:04 +1000 (EST) (envelope-from marka) Message-Id: <200404220312.i3M3C4T1099187@drugs.dv.isc.org> Date: Thu, 22 Apr 2004 13:12:04 +1000 (EST) From: Mark Andrews To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: gnu/65869: cvs generates invalid cvs command lines X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Mark Andrews List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2004 03:20:15 -0000 >Number: 65869 >Category: gnu >Synopsis: cvs generates invalid cvs command lines >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Apr 21 20:20:14 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Mark Andrews >Release: FreeBSD 4.9-STABLE i386 >Organization: ISC >Environment: System: FreeBSD drugs.dv.isc.org 4.9-STABLE FreeBSD 4.9-STABLE #14: Sat Feb 14 12:56:29 EST 2004 marka@drugs.dv.isc.org:/usr/obj/usr/src/sys/DRUGS i386 >Description: If a user is specified in the cvs root and that user is not the current user the '-l user' appears *after* the hostname. e.g. :ext:user@host:/remote results in the following ssh command ssh host -l user cvs server which should be ssh -l user host cvs server >How-To-Repeat: >Fix: Index: contrib/cvs/src/client.c =================================================================== RCS file: /home/ncvs/src/contrib/cvs/src/client.c,v retrieving revision 1.2.2.7 diff -u -r1.2.2.7 client.c --- contrib/cvs/src/client.c 15 Apr 2004 15:35:26 -0000 1.2.2.7 +++ contrib/cvs/src/client.c 22 Apr 2004 03:04:16 -0000 @@ -4922,7 +4922,6 @@ char **p = argv; *p++ = cvs_rsh; - *p++ = root->hostname; /* If the login names differ between client and server * pass it on to rsh. @@ -4933,6 +4932,7 @@ *p++ = root->username; } + *p++ = root->hostname; *p++ = command; *p++ = NULL; >Release-Note: >Audit-Trail: >Unformatted: