Merge branch 'fix-dnssec-slave' into 'master'

Resign should also take place if ISPC Master is not the Nameserver.

We do only trigger a rewrite of the zonefile by touching server log so no need to chank against existance of a file.
Thanks to Tom Albers who pointed me to this issue by providing an excellent bug report!
Also removed some garbage

Probably this should even go into next 3.1 patch as it really can break DNSSEC when the nameserver is on a slave. Not talking about slave zones or replication but talking about a nameserver not running on ISPC Masterserver
Weird nobody noticed this yet... Thanks and Credits to @tom who noticed this

This fix has been successfully tested on a singleserver as well as toms Server where the issue occured.

See merge request !603

Author: Till Brehm

server/lib/classes/cron.d/550-bind_dnssec.inc.php

@@ -82,18 +82,13 @@ public function onRunJob() {
 
 		//* Load libraries
 		$app->uses("getconf,tpl");
-
-		//* load the server configuration options
-		$dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns');
 
 		//TODO : change this when distribution information has been integrated into server record
 		$filespre = (file_exists('/etc/gentoo-release')) ? 'pri/' : 'pri.';
-		$soas = $app->db->queryAllRecords("SELECT id,serial,origin FROM dns_soa WHERE server_id = ? AND active= 'Y' AND dnssec_wanted = 'Y' AND dnssec_initialized = 'Y' AND (dnssec_last_signed < ? OR dnssec_last_signed > ?)", $conf['server_id'], time()-(3600*24*5)+900, time()+900); //Resign zones every 5 days (expiry is 16 days so we have enough safety, 15 minutes tolerance)
+		$soas = $app->db->queryAllRecords("SELECT id,serial,origin FROM dns_soa WHERE active= 'Y' AND dnssec_wanted = 'Y' AND dnssec_initialized = 'Y' AND (dnssec_last_signed < ? OR dnssec_last_signed > ?)", time()-(3600*24*5)+900, time()+900); //Resign zones every 5 days (expiry is 16 days so we have enough safety, 15 minutes tolerance)
 
 		foreach ($soas as $data) {
 			$domain = substr($data['origin'], 0, strlen($data['origin'])-1);
-			if (!file_exists($dns_config['bind_zonefiles_dir'].'/'.$filespre.$domain)) continue;
-			
 			$app->log('DNSSEC Auto-Resign: Touching zone '.$domain, LOGLEVEL_DEBUG);
 			$app->db->datalogUpdate('dns_soa', array("serial" => $this->increase_serial($data['serial'])), 'id', $data['id']);
 		}