Merge pull request #2445 from mind04/3.4.4

make makeRelative() case insensitive

Author: Peter van Dijk

pdns/backends/gsql/gsqlbackend.cc

@@ -372,7 +372,7 @@ bool GSQLBackend::updateDNSSECOrderAndAuthAbsolute(uint32_t domain_id, const std
     return false;
   char output[1024];
 
-  snprintf(output, sizeof(output)-1, d_setOrderAuthQuery.c_str(), sqlEscape(ordername).c_str(), auth, sqlEscape(qname).c_str(), domain_id);
+  snprintf(output, sizeof(output)-1, d_setOrderAuthQuery.c_str(), sqlEscape(ordername).c_str(), auth, sqlEscape(toLower(qname)).c_str(), domain_id);
   try {
     d_db->doCommand(output);
   }
@@ -388,7 +388,7 @@ bool GSQLBackend::nullifyDNSSECOrderNameAndUpdateAuth(uint32_t domain_id, const
     return false;
   char output[1024];
 
-  snprintf(output, sizeof(output)-1, d_nullifyOrderNameAndUpdateAuthQuery.c_str(), auth, domain_id, sqlEscape(qname).c_str());
+  snprintf(output, sizeof(output)-1, d_nullifyOrderNameAndUpdateAuthQuery.c_str(), auth, domain_id, sqlEscape(toLower(qname)).c_str());
   try {
     d_db->doCommand(output);
   }
@@ -404,7 +404,7 @@ bool GSQLBackend::nullifyDNSSECOrderNameAndAuth(uint32_t domain_id, const std::s
     return false;
   char output[1024];
 
-  snprintf(output, sizeof(output)-1, d_nullifyOrderNameAndAuthQuery.c_str(), sqlEscape(qname).c_str(), sqlEscape(type).c_str(), domain_id);
+  snprintf(output, sizeof(output)-1, d_nullifyOrderNameAndAuthQuery.c_str(), sqlEscape(toLower(qname)).c_str(), sqlEscape(type).c_str(), domain_id);
   try {
     d_db->doCommand(output);
   }

pdns/misc.cc

@@ -654,7 +654,7 @@ string makeRelative(const std::string& fqdn, const std::string& zone)
 {
   if(zone.empty())
     return fqdn;  
-  if(fqdn != zone)
+  if(toLower(fqdn) != toLower(zone))
     return fqdn.substr(0, fqdn.size() - zone.length() - 1); // strip domain name
   return "";
 }

pdns/test-misc_hh.cc

@@ -110,6 +110,7 @@ BOOST_AUTO_TEST_CASE(test_labelReverse) {
 
 BOOST_AUTO_TEST_CASE(test_makeRelative) {
     BOOST_CHECK_EQUAL(makeRelative("www.powerdns.com", "powerdns.com"), "www");
+    BOOST_CHECK_EQUAL(makeRelative("PoWeRdNs.CoM", "powerdns.com"), "");
 }
 
 BOOST_AUTO_TEST_CASE(test_AtomicCounter) {