ius/dnstools: comparison update-serial.pl

equal deleted inserted replaced

-:c44bc1c8e396
+:6adcf16d5cd6
 sub update_index($);
 sub sign_expired($);
 sub need_rollover();
 sub done_rollover();
 sub begin_rollover(@);
-sub kill_useless_keys($);
+sub unlink_unused_keys($);
 sub sign_zone;
 sub update_serial;
 sub mk_zone_conf;
 sub file_entry;
 open($fh, ">$dir/.keycounter") or die "$dir/.keycounter: $!\n";
 say $fh 0;
 close($fh);
-kill_useless_keys($zone);
+unlink_unused_keys($zone);
 &key_to_zonefile($zone);
 push @r, $zone;
 }
 return @r;
 open(ZONEFILE, ">$zpf/$zone") or die "$zpf/$zone: $!\n";
 print ZONEFILE @new_content;
 close(ZONEFILE);
 }
-sub kill_useless_keys($) {
+sub unlink_unused_keys($) {
 # die funktion loescht alle schluessel die nicht in der index.zsk
 # der uebergebenen zone stehen
 my $zone = shift;
-my @keys = ();
+my @keys;
 my $dir  = "$config{master_dir}/$zone";
 {
 	# collect the keys and cut everything except the key id
+	# we cut the basenames (w/o the .private|.key suffix)
 open(my $zsk, "<$dir/.index.zsk") or die "$dir/.index.zsk: $!\n";
 open(my $ksk, "<$dir/.index.ksk") or die "$dir/.index.ksk: $!\n";
-	@keys = map { basename $_, ".private", ".key" } (<$zsk>, <$ksk>);
+	@keys = (<$zsk>, <$ksk>);
 }
-### @keys
 # prueft alle schluesseldateien (ksk, zsk) ob sie in der jeweiligen
 # indexdatei beschrieben sind. wenn nicht werden sie geloescht.
-# ---- <><><><>
+for my $file (glob "$dir/K*.key $dir/K*.private") {
-for my $file (grep /(?:key|private)$/ => glob "$config{master_dir}/$zone/K*") {
+	unlink $file if basename($file, ".key", ".private") ~~ @keys;
-	$file = basename $file, ".private", ".key";
-	unlink "$file.key", "$file.private" if $file ~~ @keys;
 }
 }
 sub end_ro {
 our @end_ro_list;
 if ($count > 1) {
 open(INDEX, ">$config{master_dir}/$zone/.index.zsk");
 print INDEX $last_key;
 close(INDEX);
 }
-kill_useless_keys($zone);
+unlink_unused_keys($zone);
 &key_to_zonefile($zone);
 push @new_serial, $zone;
 }
 }

branch	hs12
changeset 67	6adcf16d5cd6
parent 66	c44bc1c8e396
parent 65	ea0afdd6b026
child 70	bffb3f2cca90