Merge branch '6575-fix-dns-dmarc-validation' into 'develop'

Updated validation for DNS DMARC creation/update fixes #6575

Closes #6575

See merge request ispconfig/ispconfig3!1804

Author: Till Brehm

interface/web/dns/dns_dmarc_edit.php

@@ -228,7 +228,7 @@ function onSubmit() {
 		// DMARC requieres at least one active dkim-record...
 		$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 ? AND type='TXT' AND data like 'v=DKIM1;%' AND dns_rr.active='Y'";
+					WHERE dns_soa.origin = ? AND dns_rr.name LIKE ? AND ((type='TXT' AND data LIKE 'v=DKIM%') OR type='CNAME') AND dns_rr.active='Y'";
 		$temp = $app->db->queryAllRecords($sql, $soa['origin'], '%._domainkey%');
 		if (empty($temp)) {
 			if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;