mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 12:03:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Look for password in both CVS and CVSNT password files.

Browse Source 
In conn, if password is not passed on command line, look for a password
entry in both the CVS password file and the CVSNT password file.  If only
one file is found and the requested repository is in that file, or if both
files are found but the requested repository is found in only one file, use
the password from the single file containing the repository entry.  If both
files are found and the requested repository is found in both files, then
produce an error message.

The CVS password file separates tokens with a space character, while
the CVSNT password file separates tokens with an equal (=) character.
Add a sub find_password_entry that accepts the password file name
and a delimiter to eliminate code duplication.

Signed-off-by: Guy Rouillier <guyr@burntmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Guy Rouillier 2011-05-01 01:33:52 -04:00 committed by Junio C Hamano
parent 7ed863a85a
commit 58fdef0cff
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
git-cvsimport.perl
View File

@ -227,6 +227,31 @@ sub new {
return $self; return $self;
} }
sub find_password_entry {
my ($cvspass, @cvsroot) = @_;
my ($file, $delim) = @$cvspass;
my $pass;
local ($_);
if (open(my $fh, $file)) {
# :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z
CVSPASSFILE:
while (<$fh>) {
chomp;
s/^\/\d+\s+//;
my ($w, $p) = split($delim,$_,2);
for my $cvsroot (@cvsroot) {
if ($w eq $cvsroot) {
$pass = $p;
last CVSPASSFILE;
}
}
}
close($fh);
}
return $pass;
}
sub conn { sub conn {
my $self = shift; my $self = shift;
my $repo = $self->{'fullrep'}; my $repo = $self->{'fullrep'};
@ -259,19 +284,23 @@ sub conn {
if ($pass) { if ($pass) {
$pass = $self->_scramble($pass); $pass = $self->_scramble($pass);
} else { } else {
open(H,$ENV{'HOME'}."/.cvspass") and do { my @cvspass = ([$ENV{'HOME'}."/.cvspass", qr/\s/],
# :pserver:cvs@mea.tmt.tele.fi:/cvsroot/zmailer Ah<Z [$ENV{'HOME'}."/.cvs/cvspass", qr/=/]);
while (<H>) { my @loc = ();
chomp; foreach my $cvspass (@cvspass) {
s/^\/\d+\s+//; my $p = find_password_entry($cvspass, $rr, $rr2);
my ($w,$p) = split(/\s/,$_,2); if ($p) {
if ($w eq $rr or $w eq $rr2) { push @loc, $cvspass->[0];
$pass = $p; $pass = $p;
last;
}
} }
}; }
$pass = "A" unless $pass;
if (1 < @loc) {
die("Multiple cvs password files have ".
"entries for CVSROOT $opt_d: @loc");
} elsif (!$pass) {
$pass = "A";
}
} }
my ($s, $rep); my ($s, $rep);