From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 19 Nov 2020 13:24:01 +0000 (+0100)
Subject: rec: Fix getEDNSExtendedErrorOptFromString() on CentOS 6
X-Git-Tag: auth-4.5.0-alpha0~17^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6ecb5b28053bd99ed50196ac0a9315df7dd2eaf;p=thirdparty%2Fpdns.git

rec: Fix getEDNSExtendedErrorOptFromString() on CentOS 6

pdns_string_view falls back to a regular string there, so there
was an ambiguity on which overloaded function to call.
---

diff --git a/pdns/recursordist/ednsextendederror.cc b/pdns/recursordist/ednsextendederror.cc
index 9903a0770f..cf611d0016 100644
--- a/pdns/recursordist/ednsextendederror.cc
+++ b/pdns/recursordist/ednsextendederror.cc
@@ -22,7 +22,7 @@
 #include "ednsextendederror.hh"
 #include "views.hh"
 
-static bool getEDNSExtendedErrorOptFromString(const pdns_string_view option, EDNSExtendedError& eee)
+static bool getEDNSExtendedErrorOptFromStringView(const pdns_string_view& option, EDNSExtendedError& eee)
 {
   if (option.size() < sizeof(uint16_t)) {
     return false;
@@ -38,12 +38,12 @@ static bool getEDNSExtendedErrorOptFromString(const pdns_string_view option, EDN
 
 bool getEDNSExtendedErrorOptFromString(const string& option, EDNSExtendedError& eee)
 {
-  return getEDNSExtendedErrorOptFromString(pdns_string_view(option), eee);
+  return getEDNSExtendedErrorOptFromStringView(pdns_string_view(option), eee);
 }
 
 bool getEDNSExtendedErrorOptFromString(const char* option, unsigned int len, EDNSExtendedError& eee)
 {
-  return getEDNSExtendedErrorOptFromString(pdns_string_view(option, len), eee);
+  return getEDNSExtendedErrorOptFromStringView(pdns_string_view(option, len), eee);
 }
 
 string makeEDNSExtendedErrorOptString(const EDNSExtendedError& eee)