|
Lines 345-351
Link Here
|
| 345 |
einfo "Running $cmdcheckout" |
345 |
einfo "Running $cmdcheckout" |
| 346 |
eval $cmdcheckout|| die "cvs checkout command failed" |
346 |
eval $cmdcheckout|| die "cvs checkout command failed" |
| 347 |
fi |
347 |
fi |
| 348 |
elif [ "${ECVS_AUTH}" == "ext" ]; then |
348 |
elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then |
| 349 |
|
349 |
|
| 350 |
# Hack to support SSH password authentication |
350 |
# Hack to support SSH password authentication |
| 351 |
|
351 |
|
|
Lines 387-394
Link Here
|
| 387 |
newarglist = sys.argv[:] |
387 |
newarglist = sys.argv[:] |
| 388 |
EOF |
388 |
EOF |
| 389 |
|
389 |
|
| 390 |
# Handle SSH host key checking |
390 |
# disable X11 forwarding which causes .xauth access violations |
|
|
391 |
# - 20041205 Armando Di Cianno <fafhrd@gentoo.org> |
| 392 |
echo "newarglist.insert(1, '-oClearAllForwardings=yes')" \ |
| 393 |
>> "${CVS_RSH}" |
| 394 |
echo "newarglist.insert(1, '-oForwardX11=no')" \ |
| 395 |
>> "${CVS_RSH}" |
| 391 |
|
396 |
|
|
|
397 |
# Handle SSH host key checking |
| 392 |
local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts" |
398 |
local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts" |
| 393 |
echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \ |
399 |
echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \ |
| 394 |
>> "${CVS_RSH}" |
400 |
>> "${CVS_RSH}" |
|
Lines 398-405
Link Here
|
| 398 |
einfo "A temporary known hosts list will be used." |
404 |
einfo "A temporary known hosts list will be used." |
| 399 |
local CVS_ECLASS_STRICT_HOST_CHECKING="no" |
405 |
local CVS_ECLASS_STRICT_HOST_CHECKING="no" |
| 400 |
touch "${CVS_ECLASS_KNOWN_HOSTS}" |
406 |
touch "${CVS_ECLASS_KNOWN_HOSTS}" |
| 401 |
echo "newarglist.insert(1, '-oStrictHostKeyChecking=no')" \ |
|
|
| 402 |
>> "${CVS_RSH}" |
| 403 |
else |
407 |
else |
| 404 |
local CVS_ECLASS_STRICT_HOST_CHECKING="yes" |
408 |
local CVS_ECLASS_STRICT_HOST_CHECKING="yes" |
| 405 |
echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}" |
409 |
echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}" |
|
Lines 423-432
Link Here
|
| 423 |
# Create a dummy executable to echo $ECVS_PASS |
427 |
# Create a dummy executable to echo $ECVS_PASS |
| 424 |
|
428 |
|
| 425 |
export SSH_ASKPASS="${T}/cvs_sshechopass" |
429 |
export SSH_ASKPASS="${T}/cvs_sshechopass" |
|
|
430 |
if [ "${ECVS_AUTH}" != "no" ]; then |
| 431 |
echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \ |
| 432 |
> "${SSH_ASKPASS}" |
| 433 |
else |
| 434 |
echo -en "#!/bin/bash\nreturn\n" \ |
| 435 |
> "${SSH_ASKPASS}" |
| 426 |
|
436 |
|
| 427 |
echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \ |
437 |
fi |
| 428 |
> "${SSH_ASKPASS}" |
|
|
| 429 |
|
| 430 |
chmod a+x "${SSH_ASKPASS}" |
438 |
chmod a+x "${SSH_ASKPASS}" |
| 431 |
fi |
439 |
fi |
| 432 |
|
440 |
|
|
Lines 451-464
Link Here
|
| 451 |
else |
459 |
else |
| 452 |
unset DISPLAY |
460 |
unset DISPLAY |
| 453 |
fi |
461 |
fi |
| 454 |
elif [ "${ECVS_AUTH}" == "no" ]; then |
|
|
| 455 |
if [ "${mode}" == "update" ]; then |
| 456 |
einfo "Running $cmdupdate" |
| 457 |
eval $cmdupdate || die "cvs update command failed" |
| 458 |
elif [ "${mode}" == "checkout" ]; then |
| 459 |
einfo "Running $cmdcheckout" |
| 460 |
eval $cmdcheckout|| die "cvs checkout command failed" |
| 461 |
fi |
| 462 |
fi |
462 |
fi |
| 463 |
|
463 |
|
| 464 |
# Restore ownership. Not sure why this is needed, but someone |
464 |
# Restore ownership. Not sure why this is needed, but someone |
