summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorPascal Obry <pascal@obry.net>2009-09-04 11:58:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-09-06 05:34:27 (GMT)
commit3fb9d58235ce4985689840b901aecacc6e3bd094 (patch)
treecbf235fd1c9b3b54b84205f60516f9fa02eeff30 /git-cvsimport.perl
parent79b4fde573eb5e86a8109d100ad182be1eb5fc54 (diff)
downloadgit-3fb9d58235ce4985689840b901aecacc6e3bd094.zip
git-3fb9d58235ce4985689840b901aecacc6e3bd094.tar.gz
git-3fb9d58235ce4985689840b901aecacc6e3bd094.tar.bz2
Do not scramble password read from .cvspass
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>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 593832d..d741115 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -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) {