{"thread":{"id":"20850","subject":"[PATCH] Do not scramble password read from .cvspass","startedAt":"2009-09-04T11:58:32Z","lastAt":"2009-09-07T10:39:54Z","messageCount":3,"participants":["Pascal Obry","Junio C Hamano","Dirk Hörner"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"122424","messageId":"4AA100E8.9030806@obry.net","threadId":"20850","inReplyTo":null,"subject":"[PATCH] Do not scramble password read from .cvspass","fromName":"Pascal Obry","fromEmail":"pascal@obry.net","sentAt":"2009-09-04T11:58:32Z","receivedAt":"2009-09-04T11:58:32Z","isPatch":true,"sender":{"key":"pascal@obry.net","avatar":"https://avatars.githubusercontent.com/u/467069?v=4"},"body":"\nPasswords stored in .cvspass are already scrambled, we do not\nwant to scramble them twice. Only passwords read from the\ncommand line are scrambled.\n\nThis fixes a regression introduced by:\nb2139dbd72d16e40eddfd5b9ad1314703b39fe65\n\nSigned-off-by: Pascal Obry <pascal@obry.net>\n---\n  git-cvsimport.perl |    7 ++++---\n  1 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/git-cvsimport.perl b/git-cvsimport.perl\nindex 593832d..c5cdcae 100755\n--- a/git-cvsimport.perl\n+++ b/git-cvsimport.perl\n@@ -238,7 +238,10 @@ sub conn {\n                 }\n                 my $rr = \":pserver:$user\\@$serv:$port$repo\";\n\n-               unless ($pass) {\n+               if ($pass) {\n+                   $pass = $self->_scramble($pass);\n+               } else\n+               {\n                         open(H,$ENV{'HOME'}.\"/.cvspass\") and do {\n                                 # \n:pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z\n                                 while (<H>) {\n@@ -253,8 +256,6 @@ sub conn {\n                         };\n                 }\n\n-               $pass = $self->_scramble($pass);\n-\n                 my ($s, $rep);\n                 if ($proxyhost) {\n\n--\n1.6.4.2.253.g0b1fac\n\n\n-- \n\n--|------------------------------------------------------\n--| Pascal Obry                           Team-Ada Member\n--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE\n--|------------------------------------------------------\n--|    http://www.obry.net  -  http://v2p.fr.eu.org\n--| \"The best way to travel is by means of imagination\"\n--|\n--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B\n"},{"id":"122442","messageId":"7vvdjyn0j3.fsf@alter.siamese.dyndns.org","threadId":"20850","inReplyTo":"4AA100E8.9030806@obry.net","subject":"Re: [PATCH] Do not scramble password read from .cvspass","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-09-04T16:21:36Z","receivedAt":"2009-09-04T16:21:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pascal Obry <pascal@obry.net> writes:\n\n> Passwords stored in .cvspass are already scrambled, we do not\n> want to scramble them twice. Only passwords read from the\n> command line are scrambled.\n>\n> This fixes a regression introduced by:\n> b2139dbd72d16e40eddfd5b9ad1314703b39fe65\n>\n> Signed-off-by: Pascal Obry <pascal@obry.net>\n> ---\n\nThanks, Pascal.  This bug is not in any tagged release yet, and I am happy\nyou caught it before -rc0 ;-)\n\nDirk, does the patch look Ok to you?\n\n>  git-cvsimport.perl |    7 ++++---\n>  1 files changed, 4 insertions(+), 3 deletions(-)\n>\n> diff --git a/git-cvsimport.perl b/git-cvsimport.perl\n> index 593832d..c5cdcae 100755\n> --- a/git-cvsimport.perl\n> +++ b/git-cvsimport.perl\n> @@ -238,7 +238,10 @@ sub conn {\n>                 }\n>                 my $rr = \":pserver:$user\\@$serv:$port$repo\";\n>\n> -               unless ($pass) {\n> +               if ($pass) {\n> +                   $pass = $self->_scramble($pass);\n> +               } else\n> +               {\n>                         open(H,$ENV{'HOME'}.\"/.cvspass\") and do {\n>                                 #\n> :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z\n>                                 while (<H>) {\n> @@ -253,8 +256,6 @@ sub conn {\n>                         };\n>                 }\n>\n> -               $pass = $self->_scramble($pass);\n> -\n>                 my ($s, $rep);\n>                 if ($proxyhost) {\n>\n> --\n> 1.6.4.2.253.g0b1fac\n"},{"id":"122613","messageId":"4da546dc0909070339x5d78164flc4171882e8b028db@mail.gmail.com","threadId":"20850","inReplyTo":"7vvdjyn0j3.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Do not scramble password read from .cvspass","fromName":"Dirk Hörner","fromEmail":"dirker@gmail.com","sentAt":"2009-09-07T10:39:54Z","receivedAt":"2009-09-07T10:39:54Z","isPatch":true,"sender":{"key":"dirker@gmail.com","avatar":null},"body":"Hi Junio,\n\nOn Fri, Sep 4, 2009 at 6:21 PM, Junio C Hamano<gitster@pobox.com> wrote:\n> Dirk, does the patch look Ok to you?\n\nThe patch looks fine :-)\n\nCiao,\nDirk\n\n>\n>>  git-cvsimport.perl |    7 ++++---\n>>  1 files changed, 4 insertions(+), 3 deletions(-)\n>>\n>> diff --git a/git-cvsimport.perl b/git-cvsimport.perl\n>> index 593832d..c5cdcae 100755\n>> --- a/git-cvsimport.perl\n>> +++ b/git-cvsimport.perl\n>> @@ -238,7 +238,10 @@ sub conn {\n>>                 }\n>>                 my $rr = \":pserver:$user\\@$serv:$port$repo\";\n>>\n>> -               unless ($pass) {\n>> +               if ($pass) {\n>> +                   $pass = $self->_scramble($pass);\n>> +               } else\n>> +               {\n>>                         open(H,$ENV{'HOME'}.\"/.cvspass\") and do {\n>>                                 #\n>> :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z\n>>                                 while (<H>) {\n>> @@ -253,8 +256,6 @@ sub conn {\n>>                         };\n>>                 }\n>>\n>> -               $pass = $self->_scramble($pass);\n>> -\n>>                 my ($s, $rep);\n>>                 if ($proxyhost) {\n>>\n>> --\n>> 1.6.4.2.253.g0b1fac\n>\n"}]}