--- a/dnssec-killkey Fri Aug 13 10:09:37 2010 +0200
+++ b/dnssec-killkey Fri Aug 13 17:00:37 2010 +0200
@@ -47,20 +47,33 @@
for (@ARGV) {
chomp( $zone = `idn --quiet $_` );
my $zdir = "$master_dir/$zone";
+ my $ep = 0;
+
unless ( -e "$master_dir/$zone" ) {
print "$zone ist keine verwaltete zone \n";
}
else {
- if ( -e "$zdir/$zone.signed" ) { unlink "$zdir/$zone.signed" }
- if ( -e "$zdir/.keycounter" ) { unlink "$zdir/.keycounter" }
- if ( -e "$zdir/.index.ksk" ) { unlink "$zdir/.index.ksk" }
- if ( -e "$zdir/.index.zsk" ) { unlink "$zdir/.index.zsk" }
- if ( -e "$zdir/dsset-$zone." ) { unlink "$zdir/dsset-$zone." }
- if ( -e "$zdir/keyset-$zone." ) { unlink "$zdir/keyset-$zone." }
- for (`ls $master_dir/$zone/K*[key,private]`) { unlink $_ }
+ if ( -e "$zdir/$zone.signed" ) {
+ unlink "$zdir/$zone.signed" and $ep = 1 }
+ if ( -e "$zdir/.keycounter" ) {
+ unlink "$zdir/.keycounter" and $ep = 1 }
+ if ( -e "$zdir/.index.ksk" ) {
+ unlink "$zdir/.index.ksk" and $ep = 1 }
+ if ( -e "$zdir/.index.zsk" ) {
+ unlink "$zdir/.index.zsk" and $ep = 1 }
+ if ( -e "$zdir/dsset-$zone." ) {
+ unlink "$zdir/dsset-$zone." and $ep = 1 }
+ if ( -e "$zdir/keyset-$zone." ) {
+ unlink "$zdir/keyset-$zone." and $ep = 1 }
- print "keys removed \n";
-
+ for (`ls $master_dir/$zone/K*[key,private]`) {
+ unlink $_ and $ep = 1
+ }
+
+ if ($ep == 1) {
+ print "$zone: keys removed\n";
+ }
+
open( ZONE, "$master_dir/$zone/$zone" )
or die "$master_dir/$zone/$zone: $!\n";
@old_zone_content = <ZONE>;