X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_ASA_PostArchive_Update;h=475a4778e529e9842c66325e0b16f9d1566d4e4c;hp=8d69bf633febf5c79a974944c7ccb583ba01bbe3;hb=0a4689159b1f9dc6d99086cedc54990ab61721b8;hpb=6e361dfbcfd712fd68d507a90cf3a0b5f7a089cd

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index 8d69bf6..475a477 100755
--- a/bin/BackupPC_ASA_PostArchive_Update
+++ b/bin/BackupPC_ASA_PostArchive_Update
@@ -140,8 +140,11 @@ sub check_archive {
 	my $md5_path = "$Conf{ArchiveDest}/$host.$num.md5";
 	unlink $md5_path if -s $md5_path == 0; # fix empty
 
+	my $read_protect = 0;
+
 	if ( ! -e $md5_path ) {
 		system_ok "cd $Conf{ArchiveDest} && /usr/bin/md5sum $host.$num.* > $md5_path";
+		$read_protect = 1;
 	} else {
 		system_ok "cd $Conf{ArchiveDest} && /usr/bin/md5sum -c $md5_path" if $opt->check;
 	}
@@ -150,6 +153,12 @@ sub check_archive {
 	foreach ( split(/\n/, read_file "$Conf{ArchiveDest}/$host.$num.md5" ) ) {
 		my ( $md5, $path ) = split(/\s+/,$_);
 		$md5sum->{$path} = $md5;
+		if ( $read_protect ) {
+			my $full = "$Conf{ArchiveDest}/$path";
+			my $perm = (stat $full)[2] & 0444;
+			warn sprintf("chmod %03o %s\n",$perm,$full);
+			chmod $perm, $full;
+		}
 	}
 
 	# depending on expected returned value this is used like:
@@ -183,16 +192,16 @@ sub check_archive {
 	}
 
 	sub check_part {
-		my ($host, $num, $part_nr, $tar_size, $size, $md5, $items) = @_;
+		my ($host, $num, $part_nr, $tar_size, $size, $md5, $items, $filename) = @_;
 		my $backup_id = get_backup_id($host, $num);
 		my $sth_md5 = $dbh->prepare(qq{
 			select
-				id, tar_size, size, md5, items
+				id, tar_size, size, md5, items, filename
 			from backup_parts
-			where backup_id = ? and part_nr = ?
+			where backup_id = ? and part_nr = ? and filename = ?
 		});
 
-		$sth_md5->execute($backup_id, $part_nr);
+		$sth_md5->execute($backup_id, $part_nr, $filename);
 
 		if (my $row = $sth_md5->fetchrow_hashref) {
 			return if (
@@ -212,11 +221,12 @@ sub check_archive {
 				tar_size,
 				size,
 				md5,
-				items
-			) values (?,?,?,?,?,?)
+				items,
+				filename
+			) values (?,?,?,?,?,?,?)
 		});
 
-		$sth_insert->execute($backup_id, $part_nr, $tar_size, $size, $md5, $items);
+		$sth_insert->execute($backup_id, $part_nr, $tar_size, $size, $md5, $items, $filename);
 		$dbh->commit;
 	}
 
@@ -263,8 +273,8 @@ sub check_archive {
 			$items++;
 			$tar_size_inarc += $entry->size;
 
-			if ($tar_size_inarc > $Conf{ArchiveChunkSize}) {
-				print ", part $filename is too big $tar_size_inarc > $Conf{ArchiveChunkSize}\n";
+			if ($tar_size_inarc > $Conf{ArchiveMediaSize}) {
+				print ", part $filename is too big $tar_size_inarc > $Conf{ArchiveMediaSize}\n";
 				return 0;
 			}
 
@@ -298,10 +308,10 @@ sub check_archive {
 		my $items = 1;
 		$part_nr++;
 
-		check_part($host, $num, $part_nr, $tar_size, $size, $md5, $items);
+		check_part($host, $num, $part_nr, $tar_size, $size, $md5, $items, $filename);
 
 		# round increment size to 2k block size
-		$inc_size += int(($size + 2048) / 2048);
+		$inc_size += int((($size + 2048) / 2048 ) * 2048);
 	}
 
 	$sth_inc_size->execute(