--- a/dnssec-killkey	Wed Aug 04 11:27:21 2010 +0200
+++ b/dnssec-killkey	Thu Aug 05 10:49:36 2010 +0200
@@ -40,19 +40,16 @@
 for (@ARGV) {
         chomp ($zone = `idn --quiet $_`);
 	my $zdir = "$master_dir/$zone";
-        if (-e "$master_dir/$zone") {
-
+	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 $_}
-
-        } else {
-                print "$zone ist keine verwaltete zone \n";
         }
 }
 
@@ -69,7 +66,10 @@
 	if (-e "$master_dir/$zone/.index.zsk") {
 		@status = stat("$master_dir/$zone/.index.zsk");
 		$status[9] += (3600 * $ablauf_zeit);
-	} else { next; }
+	}
+	else {
+		next;
+	}
 
 	# prueft ob das key-rollover-ende erreicht ist
 	unless ($status[9] < $now_time ) {
@@ -78,12 +78,12 @@
 
 	# prueft die anzahl der schluessel in der ".index.zsk"
 	# loescht alte schluessel
-	open (INDEX, "$master_dir/$zone/.index.zsk");
+	open (INDEX, "$master_dir/$zone/.index.zsk") or die "$master_dir/$zone/.index.zsk: $!\n";
 	@index = <INDEX>;
 	$index_wc = @index;
 	close (INDEX);
 	if ($index_wc > 1) {
-		open (INDEX, ">$master_dir/$zone/.index.zsk");
+		open (INDEX, ">$master_dir/$zone/.index.zsk")or die "$master_dir/$zone/.index.zsk: $!\n";
 		print INDEX $index[1];
 		close (INDEX);
 		push @auto, $zone;
@@ -91,12 +91,12 @@
 
 	# prueft die anzahl der schluessel in der ".index.ksk"
 	# loescht alte schluessel
-	open (INDEX, "$master_dir/$zone/.index.ksk");
+	open (INDEX, "$master_dir/$zone/.index.ksk") or die "$master_dir/$zone/.index.ksk: $!\n";
 	@index = <INDEX>;
 	$index_wc = @index;
 	close (INDEX);
 	if ($index_wc > 1) {
-		open (INDEX, ">$master_dir/$zone/.index.ksk");
+		open (INDEX, ">$master_dir/$zone/.index.ksk") or die "$master_dir/$zone/.index.ksk: $!\n";
 		print INDEX $index[1];
 		close (INDEX);
 		push @auto, $zone;
@@ -114,15 +114,15 @@
 	my @keylist = ();
 	my $file;
 
-	open (INDEX, "$master_dir/$zone/.index.zsk");
+	open (INDEX, "$master_dir/$zone/.index.zsk") or die "$master_dir/$zone/.index.zsk: $!\n";
 	@keylist = <INDEX>;
 	close (INDEX);
 
-	open (INDEX, "$master_dir/$zone/.index.ksk");
+	open (INDEX, "$master_dir/$zone/.index.ksk") or die "$master_dir/$zone/.index.ksk: $!\n";
 	push @keylist, <INDEX>;
 	close (INDEX);
 
-	open (ZONE, "$master_dir/$zone/$zone");
+	open (ZONE, "$master_dir/$zone/$zone") or die "$master_dir/$zone/$zone: $!\n";
 	@old_zone_content = <ZONE>;
 	close (ZONE);
 
@@ -156,7 +156,7 @@
 				# schluessel die in der indexdatei standen, werden an die
 				# zonedatei angehangen.
 				if ($file =~ /.*key/) {
-					open (KEYFILE, "$file");
+					open (KEYFILE, "$file") or die "$file: $!\n";
 					push @new_zone_content, <KEYFILE>;
 					close (KEYFILE);
 					
@@ -171,7 +171,7 @@
 		}
 	}
 
-	open (ZONE, ">$master_dir/$zone/$zone");
+	open (ZONE, ">$master_dir/$zone/$zone") or die "$master_dir/$zone/$zone: $!\n";
 	print ZONE @new_zone_content;
 	close (ZONE);