From: Aki Tuomi <cmouse@cmouse.fi>
Date: Fri, 27 Nov 2015 10:25:57 +0000 (+0200)
Subject: Support content interpolation
X-Git-Tag: dnsdist-1.0.0-alpha1~172^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3e91ed60137d0246c800da532478be11a4b7c48;p=thirdparty%2Fpdns.git

Support content interpolation
---

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index cb193cd7c8..773efacd4f 100644
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -261,11 +261,10 @@ void GeoIPBackend::lookup(const QType &qtype, const DNSName& qdomain, DNSPacket
 
   auto i = dom.records.find(search);
   if (i != dom.records.end()) { // return static value
-    // we want MUTABLE rr here.
-    for(DNSResourceRecord rr : i->second) {
+    for(const auto& rr : i->second) {
       if (qtype == QType::ANY || rr.qtype == qtype) {
-        rr.content = format2str(rr.content, ip, v6, &gl);
 	d_result.push_back(rr);
+        d_result.back().content = format2str(rr.content, ip, v6, &gl);
 	d_result.back().qname = qdomain;
       }
     }
@@ -292,11 +291,10 @@ void GeoIPBackend::lookup(const QType &qtype, const DNSName& qdomain, DNSPacket
     // see if the record can be found
     auto ri = dom.records.find(DNSName(format));
     if (ri != dom.records.end()) { // return static value
-      // we want MUTABLE rr here.
-      for(DNSResourceRecord rr : ri->second) {
+      for(const auto& rr: ri->second) {
         if (qtype == QType::ANY || rr.qtype == qtype) {
-          rr.content = format2str(rr.content, ip, v6, &gl);
           d_result.push_back(rr);
+          d_result.back().content = format2str(rr.content, ip, v6, &gl);
           d_result.back().qname = qdomain;
         }
       }