1 files changed, 26 insertions, 21 deletions

diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index 347cf758a..98e3d0ea6 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -205,15 +205,13 @@ std::vector<std::string> DNSResolver::get_ipv4(const std::string& url, bool& dns
   dnssec_valid = false;
   char urlC[1000];  // waaaay too big, but just in case...
 
-  std::string url_copy{url};
-  if (!check_address_syntax(url_copy))
+  strncpy(urlC, url.c_str(), 999);
+  urlC[999] = '\0';
+  if (!check_address_syntax(urlC))
   {
     return addresses;
   }
 
-  strncpy(urlC, url_copy.c_str(), 999);
-  urlC[999] = '\0';
-
   // destructor takes care of cleanup
   ub_result_ptr result;
 
@@ -241,15 +239,14 @@ std::vector<std::string> DNSResolver::get_ipv6(const std::string& url, bool& dns
   dnssec_valid = false;
   char urlC[1000];  // waaaay too big, but just in case...
 
-  std::string url_copy{url};
-  if (!check_address_syntax(url_copy))
+  strncpy(urlC, url.c_str(), 999);
+  urlC[999] = '\0';
+
+  if (!check_address_syntax(urlC))
   {
     return addresses;
   }
 
-  strncpy(urlC, url_copy.c_str(), 999);
-  urlC[999] = '\0';
-
   ub_result_ptr result;
 
   // call DNS resolver, blocking.  if return value not zero, something went wrong
@@ -276,15 +273,14 @@ std::vector<std::string> DNSResolver::get_txt_record(const std::string& url, boo
   dnssec_valid = false;
   char urlC[1000];  // waaaay too big, but just in case...
 
-  std::string url_copy{url};
-  if (!check_address_syntax(url_copy))
+  strncpy(urlC, url.c_str(), 999);
+  urlC[999] = '\0';
+
+  if (!check_address_syntax(urlC))
   {
     return records;
   }
 
-  strncpy(urlC, url_copy.c_str(), 999);
-  urlC[999] = '\0';
-
   ub_result_ptr result;
 
   // call DNS resolver, blocking.  if return value not zero, something went wrong
@@ -308,6 +304,19 @@ std::vector<std::string> DNSResolver::get_txt_record(const std::string& url, boo
   return records;
 }
 
+std::string DNSResolver::get_dns_format_from_oa_address(const std::string& oa_addr)
+{
+  std::string addr(oa_addr);
+  auto first_at = addr.find("@");
+  if (first_at == std::string::npos)
+    return addr;
+
+  // convert name@domain.tld to name.domain.tld
+  addr.replace(first_at, 1, ".");
+
+  return addr;
+}
+
 DNSResolver& DNSResolver::instance()
 {
   static DNSResolver* staticInstance = NULL;
@@ -318,17 +327,13 @@ DNSResolver& DNSResolver::instance()
   return *staticInstance;
 }
 
-bool DNSResolver::check_address_syntax(std::string& addr)
+bool DNSResolver::check_address_syntax(const std::string& addr)
 {
   // if string doesn't contain a dot, we won't consider it a url for now.
-  auto first_dot = addr.find(".");
-  if (first_dot == std::string::npos)
+  if (addr.find(".") == std::string::npos)
   {
     return false;
   }
-
-  // allow name@domain.tld to work
-  addr.replace(first_dot, 1, "@");
   return true;
 }