diff options
Diffstat (limited to 'dns/dnsdist/files')
| -rw-r--r-- | dns/dnsdist/files/patch-dnsname.cc | 13 | ||||
| -rw-r--r-- | dns/dnsdist/files/patch-iputils.hh | 12 |
2 files changed, 19 insertions, 6 deletions
diff --git a/dns/dnsdist/files/patch-dnsname.cc b/dns/dnsdist/files/patch-dnsname.cc new file mode 100644 index 000000000000..ab8aac6469ca --- /dev/null +++ b/dns/dnsdist/files/patch-dnsname.cc @@ -0,0 +1,13 @@ +--- dnsname.cc.orig 2016-03-18 18:34:07 UTC ++++ dnsname.cc +@@ -142,8 +142,8 @@ bool DNSName::isPartOf(const DNSName& pa + return false; + + // this is slightly complicated since we can't start from the end, since we can't see where a label begins/ends then +- for(auto us=d_storage.cbegin(); us<d_storage.cend() && std::distance(us,d_storage.cend()) >= static_cast<unsigned int>(parent.d_storage.size()); us+=*us+1) { +- if (std::distance(us,d_storage.cend()) == static_cast<unsigned int>(parent.d_storage.size())) { ++ for(auto us=d_storage.cbegin(); us<d_storage.cend() && std::distance(us,d_storage.cend()) >= static_cast<int>(parent.d_storage.size()); us+=*us+1) { ++ if (std::distance(us,d_storage.cend()) == static_cast<int>(parent.d_storage.size())) { + auto p = parent.d_storage.cbegin(); + for(; us != d_storage.cend(); ++us, ++p) { + if(dns2_tolower(*p) != dns2_tolower(*us)) diff --git a/dns/dnsdist/files/patch-iputils.hh b/dns/dnsdist/files/patch-iputils.hh index fead6b9f76e7..5439389ca10f 100644 --- a/dns/dnsdist/files/patch-iputils.hh +++ b/dns/dnsdist/files/patch-iputils.hh @@ -1,7 +1,7 @@ ---- iputils.hh.orig 2016-01-13 10:18:24 UTC +--- iputils.hh.orig 2016-02-05 09:35:08 UTC +++ iputils.hh -@@ -59,6 +59,11 @@ - #define le64toh(x) OSSwapLittleToHostInt64(x) +@@ -79,6 +79,11 @@ + #endif +// for FreeBSD @@ -9,6 +9,6 @@ +#include <sys/endian.h> +#endif + - // for illumos - #ifdef BE_64 - + union ComboAddress { + struct sockaddr_in sin4; + struct sockaddr_in6 sin6; |