gnu/65869: cvs generates invalid cvs command lines

[Mark Andrews]

>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 at 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 at 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: