Skip to content

Commit 561740d

Browse files
committed
Fix query, dns_rr.name does not hold an fqdn
1 parent 07dcf84 commit 561740d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

interface/web/dns/dns_dmarc_edit.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,10 @@ function onSubmit() {
226226

227227
$domain_name = rtrim($soa['origin'], '.');
228228
// DMARC requieres at least one active dkim-record...
229-
$sql = "SELECT * FROM dns_rr WHERE name LIKE ? AND type='TXT' AND data like 'v=DKIM1;%' AND active='Y'";
230-
$temp = $app->db->queryAllRecords($sql, '%._domainkey.'.$domain_name.'.');
229+
$sql = "SELECT * FROM dns_rr
230+
LEFT JOIN dns_soa ON (dns_rr.zone=dns_soa.id)
231+
WHERE dns_rr.name LIKE ? AND dns_soa.origin = ? AND type='TXT' AND data like 'v=DKIM1;%' AND dns_rr.active='Y'";
232+
$temp = $app->db->queryAllRecords($sql, '%._domainkey', $soa['origin']);
231233
if (empty($temp)) {
232234
if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
233235
$app->tform->errorMessage .= $app->tform->wordbook['dmarc_no_dkim_txt'].$email;

0 commit comments

Comments
 (0)