Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ISPConfig
ISPConfig 3
Commits
366b1ad5
Unverified
Commit
366b1ad5
authored
4 years ago
by
Helmo
Browse files
Options
Downloads
Patches
Plain Diff
Also relate spf record check to a soa
parent
8a03bc6b
No related branches found
No related tags found
1 merge request
!1424
Fix query, dns_rr.name does not hold an fqdn
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
interface/web/dns/dns_dmarc_edit.php
+4
-2
4 additions, 2 deletions
interface/web/dns/dns_dmarc_edit.php
with
4 additions
and
2 deletions
interface/web/dns/dns_dmarc_edit.php
+
4
−
2
View file @
366b1ad5
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment