Changeset 349 for trunk

Timestamp:

06/26/12 13:40:41 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Convert all lookups on the domain name to use lower() on both
the domain column and the passed value

File:

• trunk/DNSDB.pm (modified) (5 diffs)

trunk/DNSDB.pm

@@ -299 +299 @@
   $hname =~ s/^\*\.//;  # this should be impossible to find in the domains table.
   my @hostbits = split /\./, $hname;
-  my $sth = $dbh->prepare("SELECT count(*),domain_id FROM domains WHERE domain = ? GROUP BY domain_id");
+  my $sth = $dbh->prepare("SELECT count(*),domain_id FROM domains WHERE lower(domain) = lower(?) GROUP BY domain_id");
   foreach (@hostbits) {
     $sth->execute($hname);
@@ -1705 +1705 @@
   return ('FAIL', "Invalid characters in domain") if $domain !~ /^[a-zA-Z0-9_.-]+$/;
 
-  my $sth = $dbh->prepare("SELECT domain_id FROM domains WHERE domain=?");
+  my $sth = $dbh->prepare("SELECT domain_id FROM domains WHERE lower(domain) = lower(?)");
   my $dom_id;
 
@@ -1725 +1725 @@
 
     # get the ID...
-    ($dom_id) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?", undef, ($domain));
+    ($dom_id) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE lower(domain) = lower(?)",
+        undef, ($domain));
 
     _log($dbh, (domain_id => $dom_id, group_id => $group,
@@ -1887 +1888 @@
   my $dbh = shift;
   my $domain = shift;
-  my ($domid) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?", undef, ($domain) );
+  my ($domid) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE lower(domain) = lower(?)",
+        undef, ($domain) );
   $errstr = $DBI::errstr if !$domid;
   return $domid if $domid;
@@ -3813 +3815 @@
   } else {
     # default to domain
-    ($zone_id) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?",
+    ($zone_id) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE lower(domain) = lower(?)",
         undef, ($zone));
     $domain_id = $zone_id;