undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not scramble password read from .cvspass

Browse Source 
Passwords stored in .cvspass are already scrambled, we do not
want to scramble them twice. Only passwords read from the
command line are scrambled.

This fixes a regression introduced by b2139db (git-cvsimport: add support
for cvs pserver password scrambling., 2009-08-14).

Signed-off-by: Pascal Obry <pascal@obry.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pascal Obry 2009-09-04 13:58:32 +02:00 committed by Junio C Hamano
parent 79b4fde573
commit 3fb9d58235
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-cvsimport.perl
View File

@ -238,7 +238,9 @@ sub conn {
}
my $rr = ":pserver:$user\@$serv:$port$repo";
unless ($pass) {
if ($pass) {
$pass = $self->_scramble($pass);
} else {
open(H,$ENV{'HOME'}."/.cvspass") and do {
# :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
while (<H>) {
@ -253,8 +255,6 @@ sub conn {
};
}
$pass = $self->_scramble($pass);
my ($s, $rep);
if ($proxyhost) {