From: Aki Tuomi <cmouse@desteem.org>
Date: Thu, 5 Nov 2015 10:14:25 +0000 (+0200)
Subject: Use DNSName with trailing dot
X-Git-Tag: dnsdist-1.0.0-alpha1~234^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5341b0fe0f3cece221e852c11986d829f035cbe2;p=thirdparty%2Fpdns.git

Use DNSName with trailing dot
---

diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index 784af21ba9..35335d8c31 100644
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -816,7 +816,7 @@ bool RemoteBackend::feedEnts(int domain_id, map<DNSName,bool>& nonterm) {
    JSON_ADD_MEMBER(parameters, "trxid", d_trxid, query.GetAllocator());
    nts.SetArray();
    for(auto t: nonterm) {
-      rapidjson::Value value(t.first.toStringNoDot().c_str(), query.GetAllocator());
+      rapidjson::Value value(t.first.toString().c_str(), query.GetAllocator());
       nts.PushBack(value, query.GetAllocator());
    }
    parameters.AddMember("nonterm", nts, query.GetAllocator());
@@ -843,7 +843,7 @@ bool RemoteBackend::feedEnts3(int domain_id, const DNSName& domain, map<DNSName,
 
    nts.SetArray();
    for(auto t: nonterm) {
-      rapidjson::Value value(t.first.toStringNoDot().c_str(), query.GetAllocator());
+      rapidjson::Value value(t.first.toString().c_str(), query.GetAllocator());
       nts.PushBack(value, query.GetAllocator());
    }
    parameters.AddMember("nonterm", nts, query.GetAllocator());
diff --git a/modules/remotebackend/remotebackend.hh b/modules/remotebackend/remotebackend.hh
index 4f7886a763..b0720879b9 100644
--- a/modules/remotebackend/remotebackend.hh
+++ b/modules/remotebackend/remotebackend.hh
@@ -29,7 +29,7 @@
 #endif
 #define JSON_GET(obj,val,def) (obj.HasMember(val)?obj["" val ""]:def)
 #define JSON_ADD_MEMBER(obj, name, val, alloc) { rapidjson::Value __xval; __xval = val; obj.AddMember(name, __xval, alloc); }
-#define JSON_ADD_MEMBER_DNSNAME(obj, name, val, alloc) { rapidjson::Value __xval(val.toStringNoDot().c_str(), alloc); obj.AddMember(name, __xval, alloc); }
+#define JSON_ADD_MEMBER_DNSNAME(obj, name, val, alloc) { rapidjson::Value __xval(val.toString().c_str(), alloc); obj.AddMember(name, __xval, alloc); }
 
 class Connector {
    public: