Merge branch 'cherry-pick-678e867f' into '1.3-fixes'

Merge branch '5923-cname-record-appear…' into 1.3-fixes

See merge request fusiondirectory/fd-plugins!521

dns/admin/systems/class_dnsHost.inc

@@ -83,7 +83,17 @@ class DnsRecordsFilteredAttribute extends DnsRecordsAttribute
     }
     $ips    = $this->plugin->parent->getBaseObject()->ipHostNumber;
     $cn     = preg_replace('/\$$/', '', $this->plugin->parent->getBaseObject()->cn);
-    if (in_array($values[2], $ips) || (!empty($cn) && (($values[0] == $cn) || preg_match('/'.preg_quote($cn.'.'.$this->getZoneName(), '/i').'/', $value[2])))) {
+    if (
+      in_array($values[2], $ips) ||
+      (
+        !empty($cn) &&
+        (
+          ($values[0] == $cn) ||
+          preg_match('/^'.preg_quote($cn.'.'.$this->getZoneName(), '/i').'$/', $value[2]) ||
+          preg_match('/ '.preg_quote($cn.'.'.$this->getZoneName(), '/i').'$/', $value[2])
+        )
+      )
+    ) {
       return $values;
     } else {
       return array();