From: bert hubert <bert.hubert@powerdns.com>
Date: Mon, 9 Nov 2015 10:28:20 +0000 (+0100)
Subject: Merge branch 'master' into dprotect
X-Git-Tag: dnsdist-1.0.0-alpha1~187^2~8^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2b55ab972853744571c6f1087821c2a7f8c87a3;p=pdns

Merge branch 'master' into dprotect

Conflicts:
	pdns/dnsname.cc
	pdns/dnsname.hh
---

c2b55ab972853744571c6f1087821c2a7f8c87a3
diff --cc pdns/dnsname.cc
index b039de179,7f7976e91..41e127230
--- a/pdns/dnsname.cc
+++ b/pdns/dnsname.cc
@@@ -152,6 -158,8 +158,10 @@@ void DNSName::makeUsRelative(const DNSN
  DNSName DNSName::labelReverse() const
  {
    DNSName ret;
++
+   if(isRoot())
+     return *this; // we don't create the root automatically below
++
    if (!empty()) {
      vector<string> l=getRawLabels();
      while(!l.empty()) {