maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

powerdns needs the 'whole' record (., e.g. sub.example.com)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-05-19 13:49:22 +02:00
parent 5c1079e04b
commit c2b0714b4a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/jobs/cron_tasks.inc.dns.20.pdns.php
View File

@@ -47,7 +47,7 @@ class pdns extends DnsBase
$zone = createDomainZone(($domain['id'] == 'none') ? $domain : $domain['id'], $isFroxlorHostname); $zone = createDomainZone(($domain['id'] == 'none') ? $domain : $domain['id'], $isFroxlorHostname);
$dom_id = $this->_insertZone($zone->origin, $zone->serial); $dom_id = $this->_insertZone($zone->origin, $zone->serial);
$this->_insertRecords($dom_id, $zone->records); $this->_insertRecords($dom_id, $zone->records, $zone->origin);
$this->_insertAllowedTransfers($dom_id); $this->_insertAllowedTransfers($dom_id);
$this->_logger->logAction(CRON_ACTION, LOG_INFO, '`' . $domain['domain'] . '` zone written'); $this->_logger->logAction(CRON_ACTION, LOG_INFO, '`' . $domain['domain'] . '` zone written');
@@ -80,7 +80,7 @@ class pdns extends DnsBase
return $lastid; return $lastid;
} }
private function _insertRecords($domainid = 0, $records) private function _insertRecords($domainid = 0, $records, $origin)
{ {
$ins_stmt = $this->pdns_db->prepare(" $ins_stmt = $this->pdns_db->prepare("
INSERT INTO records set INSERT INTO records set
@@ -96,9 +96,17 @@ class pdns extends DnsBase
foreach ($records as $record) foreach ($records as $record)
{ {
if ($record->record == '@') {
$_record = $origin;
}
else
{
$_record = $record->record.".".$origin;
}
$ins_data = array( $ins_data = array(
'did' => $domainid, 'did' => $domainid,
'rec' => $record->record, 'rec' => $_record,
'type' => $record->type, 'type' => $record->type,
'content' => $record->content, 'content' => $record->content,
'ttl' => $record->ttl, 'ttl' => $record->ttl,