Skip to content

Commit 496864a

Browse files
author
Till Brehm
committed
Merge branch '6589-caa-record-for-subdomain-none-is-added-when-auto-subdomain-is-set-to-none' into 'develop'
Resolve "CAA record for subdomain 'none' is added when auto subdomain is set to none" Closes #6589 See merge request ispconfig/ispconfig3!1814
2 parents 769bf05 + b4abe78 commit 496864a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

interface/lib/plugins/system_config_dns_ca_plugin.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function web_vhost_domain_edit($event_name, $page_form) {
7979
if(is_array($caa) && is_array($soa)) {
8080
$records = array();
8181
$records[] = $domain.'.';;
82-
if($subdomain != '' && $subdomain != 'www') $records[] = $subdomain.'.'.$domain;
82+
if($subdomain != '' && $subdomain != 'www' && $subdomain != 'none') $records[] = $subdomain.'.'.$domain;
8383
foreach($records as $record) {
8484
$new_rr = $app->db->queryOneRecord("SELECT * FROM dns_rr WHERE name = ?", $soa['origin']);
8585
unset($new_rr['id']);

0 commit comments

Comments
 (0)