From: Pascal Obry Date: Fri, 04 Sep 2009 11:58:32 GMT Subject: [PATCH] Do not scramble password read from .cvspass Message-ID: <4AA100E8.9030806@obry.net> 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: b2139dbd72d16e40eddfd5b9ad1314703b39fe65 Signed-off-by: Pascal Obry --- git-cvsimport.perl | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 593832d..c5cdcae 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -238,7 +238,10 @@ 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) { @@ -253,8 +256,6 @@ sub conn { }; } - $pass = $self->_scramble($pass); - my ($s, $rep); if ($proxyhost) { -- 1.6.4.2.253.g0b1fac -- --|------------------------------------------------------ --| Pascal Obry Team-Ada Member --| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE --|------------------------------------------------------ --| http://www.obry.net - http://v2p.fr.eu.org --| "The best way to travel is by means of imagination" --| --| gpg --keyserver keys.gnupg.net --recv-key F949BD3B