From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 04 Sep 2009 16:21:36 GMT
Subject: Re: [PATCH] Do not scramble password read from .cvspass
Message-ID: <7vvdjyn0j3.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4AA100E8.9030806@obry.net>

Pascal Obry <pascal@obry.net> 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 <pascal@obry.net>
> ---

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?

>  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