--- cvs.eclass.orig	2013-06-17 19:59:05.875372728 -0600
+++ cvs.eclass	2013-06-17 20:04:51.614602597 -0600
@@ -301,10 +301,10 @@
 
 	# Our server string (i.e. CVSROOT) without the password so it can
 	# be put in Root
+	local connection="${ECVS_AUTH}"
 	if [[ ${ECVS_AUTH} == "no" ]] ; then
 		local server="${ECVS_USER}@${ECVS_SERVER}"
 	else
-		local connection="${ECVS_AUTH}"
 		[[ -n ${ECVS_PROXY} ]] && connection+=";proxy=${ECVS_PROXY}"
 		[[ -n ${ECVS_PROXY_PORT} ]] && connection+=";proxyport=${ECVS_PROXY_PORT}"
 		local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
@@ -340,15 +340,15 @@
 		chown "${ECVS_RUNAS}" "${T}/cvspass"
 	fi
 
-	# The server string with the password in it, for login
-	cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
+	# The server string with the password in it, for login (only used for pserver)
+	cvsroot_pass=":${connection}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
 
 	# Ditto without the password, for checkout/update after login, so
 	# that the CVS/Root files don't contain the password in plaintext
 	if [[ ${ECVS_AUTH} == "no" ]] ; then
 		cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
 	else
-		cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
+		cvsroot_nopass=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
 	fi
 
 	# Commands to run