Index: branches/cname-collision/DNSDB.pm
===================================================================
--- branches/cname-collision/DNSDB.pm	(revision 959)
+++ branches/cname-collision/DNSDB.pm	(revision 960)
@@ -1658,4 +1658,7 @@
   }
 
+  # poor practice creating template records could result in a live CNAME collision
+  return ('FAIL', $errstr) unless $self->_cname_collision(%args);
+
   return ('OK','OK');
 } # done A+PTR template record
@@ -1705,4 +1708,7 @@
     return ('FAIL',"Delegation records are not permitted in default record sets");
   }
+
+  return ('FAIL', $errstr) unless $self->_cname_collision(%args);
+
   return ('OK','OK');
 } # done delegation record
@@ -1756,4 +1762,6 @@
     push @{$args{vallist}}, $liveips;
   }
+
+  return ('FAIL', $errstr) unless $self->_cname_collision(%args);
 
   return ('WARN', join("\n", $errstr, $warnmsg) ) if $warnmsg;