Index: branches/cname-collision/DNSDB.pm
===================================================================
--- branches/cname-collision/DNSDB.pm	(revision 1038)
+++ branches/cname-collision/DNSDB.pm	(revision 1039)
@@ -626,9 +626,7 @@
 
   my %args = @_;
-#my ($hcheck,$rectype,$zid,$defrec,$revrec) = @_;
 
   my $hcheck = ($args{revrec} eq 'y' ? ${$args{val}} : ${$args{host}});
   my $hfield = ($args{revrec} eq 'y' ? 'val' : 'host');
-#my $hcheck = $hname;
 
   # $hcheck should be normalized by the time this sub is called.  Convert to the formal .arpa name for error reporting in reverse zones.
@@ -640,7 +638,4 @@
   }
 
-#  my $ret = 'OK';
-#  my $msg = 'OK';
-
   # The record type comparison is the only difference between two passes through this chunk of code.
   # CNAME records require both passes, where other records only need the second one.  Downside is
@@ -649,6 +644,6 @@
     next if $tcompare eq '<>' && ${$args{rectype}} != 5;
 
-# Merging these sets of SQL statements is far too messy and doesn't reasonably
-# allow for more fine-grained error/warning messages to be returned
+    # Merging these sets of SQL statements is far too messy and doesn't reasonably
+    # allow for more fine-grained error/warning messages to be returned
 
     # First lookup fails out collisions with records without timestamps or default records (which can not have timestamps)
@@ -840,5 +835,4 @@
     return ('FAIL',"A record must be a valid IPv4 address")
 	unless $args{addr} && !$args{addr}->{isv6};
-
     # coerce IP/value to normalized form for storage
     ${$args{val}} = $args{addr}->addr;
@@ -966,10 +960,4 @@
       # Enforce this for the zone name
       return ('FAIL', "The bare zone name may not be a CNAME") if ${$args{host}} eq $pname || ${$args{host}} =~ /^\@/;
-
-#      # Check for hostnames matching new name
-#      my @t = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = ? AND type <> ? AND host = ?",
-#	undef, $args{id}, 5, ${$args{host}});
-#      return ('FAIL', "One or more existing records already use ${$args{host}}.  CNAME records cannot use the same name as other records.")
-#	if $t[0] > 0;
 
       return ('FAIL', $errstr) if ! _check_hostname_form(${$args{val}}, ${$args{rectype}}, $args{defrec}, $args{revrec});
@@ -1778,5 +1766,4 @@
     return ('FAIL',"Delegation records are not permitted in default record sets");
   }
-
   return ('OK','OK');
 } # done delegation record
@@ -2387,5 +2374,4 @@
       $cfg->{force_refresh}	= $1 if /^force_refresh\s*=\s*([a-z01]+)/i;
       $cfg->{lowercase}		= $1 if /^lowercase\s*=\s*([a-z01]+)/i;
-      $cfg->{coerce_cname_timestamp}	= $1 if /^coerce_cname_timestamp\s*=\s*(full|adjust|none)\s*$/i;
       $cfg->{showrev_arpa}	= $1 if /^showrev_arpa\s*=\s*([a-z]+)/i;
       $cfg->{coerce_cname_timestamp}	= $1 if /^coerce_cname_timestamp\s*=\s*([a-z]+)/i;