From 1f0eb51391d58958dd9f1e6cbcba622c309303b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sat, 19 Jun 2010 16:06:58 +0000 Subject: [PATCH] git-cvsserver: fix error for invalid password formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the error message to report the erroneous password character. $1 was never set in the previos version, it was a leftover from older code that used a regex for the test. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- git-cvsserver.perl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 6de7921796..0f45c39509 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -2658,7 +2658,10 @@ sub descramble # This should never happen, the same password format (A) has been # used by CVS since the beginning of time - die "invalid password format $1" unless substr($str, 0, 1) eq 'A'; + { + my $fmt = substr($str, 0, 1); + die "invalid password format `$fmt'" unless $fmt eq 'A'; + } my @str = unpack "C*", substr($str, 1); my $ret = join '', map { chr $SHIFTS[$_] } @str;