From 366b1ad510318fa74e24db76c537a837f54d4846 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Wed, 3 Mar 2021 20:22:32 +0100
Subject: [PATCH] Also relate spf record check to a soa
---
interface/web/dns/dns_dmarc_edit.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/web/dns/dns_dmarc_edit.php b/interface/web/dns/dns_dmarc_edit.php
index 00df3e88c0..e194aeb835 100644
--- a/interface/web/dns/dns_dmarc_edit.php
+++ b/interface/web/dns/dns_dmarc_edit.php
@@ -236,8 +236,10 @@ class page_action extends tform_actions {
}
// ... and an active spf-record (this breaks the current draft but DMARC is useless if you use DKIM or SPF
- $sql = "SELECT * FROM dns_rr WHERE name LIKE ? AND type='TXT' AND (data LIKE 'v=spf1%' AND active = 'y')";
- $temp = $app->db->queryAllRecords($sql, $domain_name.'.');
+ $sql = "SELECT * FROM dns_rr
+ LEFT JOIN dns_soa ON (dns_rr.zone=dns_soa.id)
+ WHERE dns_soa.origin = ? AND (dns_rr.name LIKE ? OR dns_rr.name = '') AND type='TXT' AND data like 'v=spf1%' AND dns_rr.active='Y'";
+ $temp = $app->db->queryAllRecords($sql, $soa['origin'], $soa['origin']);
// abort if more than 1 active spf-records (backward-compatibility)
if (is_array($temp[1])) {
if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
--
GitLab