[Pkg-shadow-commits] r1776 - debian/trunk/tests/common

nekral-guest at alioth.debian.org nekral-guest at alioth.debian.org
Mon Feb 11 19:48:57 UTC 2008


Author: nekral-guest
Date: 2008-02-11 19:48:56 +0000 (Mon, 11 Feb 2008)
New Revision: 1776

Modified:
   debian/trunk/tests/common/compare_file.pl
Log:
Re-indent.


Modified: debian/trunk/tests/common/compare_file.pl
===================================================================
--- debian/trunk/tests/common/compare_file.pl	2008-02-11 19:47:53 UTC (rev 1775)
+++ debian/trunk/tests/common/compare_file.pl	2008-02-11 19:48:56 UTC (rev 1776)
@@ -14,14 +14,14 @@
 	my $pass = $3;
 	$tmp = $4;
 	if ($file =~ m/^$user:/m) {
-	$file =~ s/^$user:([^:]*):(.*)$/$user:\@PASS_DES $pass\@:$2/m;
-	my $cryptpass = $1;
-	# Check the password
-	my $checkpass = qx|/usr/bin/openssl passwd -crypt -salt $cryptpass $pass|;
-	chomp $checkpass;
+		$file =~ s/^$user:([^:]*):(.*)$/$user:\@PASS_DES $pass\@:$2/m;
+		my $cryptpass = $1;
+		# Check the password
+		my $checkpass = qx|/usr/bin/openssl passwd -crypt -salt $cryptpass $pass|;
+		chomp $checkpass;
 
-	die "Wrong password: '$cryptpass'. Expected password: '$checkpass'\n"
-		if ($checkpass ne $cryptpass);
+		die "Wrong password: '$cryptpass'. Expected password: '$checkpass'\n"
+			if ($checkpass ne $cryptpass);
 	} else {
 		die "No user '$user' in ".$ARGV[1].".\n";
 	}
@@ -33,16 +33,16 @@
 	my $pass = $3;
 	$tmp = $4;
 	if ($file =~ m/^$user:/m) {
-	$file =~ s/^$user:([^:]*):(.*)$/$user:\@PASS_MD5 $pass\@:$2/m;
-	my $cryptpass = $1;
-	# Check the password
-	my $salt = $cryptpass;
-	$salt =~ s/^\$1\$//;
-	my $checkpass = qx|/usr/bin/openssl passwd -1 -salt '$salt' '$pass'|;
-	chomp $checkpass;
+		$file =~ s/^$user:([^:]*):(.*)$/$user:\@PASS_MD5 $pass\@:$2/m;
+		my $cryptpass = $1;
+		# Check the password
+		my $salt = $cryptpass;
+		$salt =~ s/^\$1\$//;
+		my $checkpass = qx|/usr/bin/openssl passwd -1 -salt '$salt' '$pass'|;
+		chomp $checkpass;
 
-	die "Wrong password: '$cryptpass'. Expected password: '$checkpass'\n"
-		if ($checkpass ne $cryptpass);
+		die "Wrong password: '$cryptpass'. Expected password: '$checkpass'\n"
+			if ($checkpass ne $cryptpass);
 	} else {
 		die "No user '$user' in ".$ARGV[1].".\n";
 	}




More information about the Pkg-shadow-commits mailing list