Re: [PATCH] Do not scramble password read from .cvspass

Pascal Obry [off-list ref] writes:

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 <redacted>
---

Thanks, Pascal.  This bug is not in any tagged release yet, and I am happy
you caught it before -rc0 ;-)

Dirk, does the patch look Ok to you?

Hi Junio,

On Fri, Sep 4, 2009 at 6:21 PM, Junio C Hamano[off-list ref] wrote:

Dirk, does the patch look Ok to you?

The patch looks fine :-)

Ciao,
Dirk

quoted

 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<Z
                                while (<H>) {

@@ -253,8 +256,6 @@ sub conn {

                        };
                }

-               $pass = $self->_scramble($pass);
-
                my ($s, $rep);
                if ($proxyhost) {

--
1.6.4.2.253.g0b1fac