From: Christian Hofstaedtler <christian.hofstaedtler@deduktiva.com>
Date: Fri, 7 Oct 2016 12:23:53 +0000 (+0200)
Subject: Remove "place" from Lua axfrfilter
X-Git-Tag: rec-4.1.0-alpha1~253^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b04b4adb86554e3d5f8af1619dc237d35c286d8;p=thirdparty%2Fpdns.git

Remove "place" from Lua axfrfilter

The slave code did not pay attention to d_place in the received
DNSResourceRecords anyway, so throwing away that info is alright.
---

diff --git a/pdns/lua-auth.cc b/pdns/lua-auth.cc
index 38d8913978..63447e235b 100644
--- a/pdns/lua-auth.cc
+++ b/pdns/lua-auth.cc
@@ -110,7 +110,6 @@ bool AuthLua::axfrfilter(const ComboAddress& remote, const DNSName& zone, const
 
   /* get the result */
   DNSResourceRecord rr;
-  rr.d_place = DNSResourceRecord::ANSWER;
   rr.ttl = 3600;
   rr.domain_id = in.domain_id;
 
@@ -140,15 +139,10 @@ bool AuthLua::axfrfilter(const ComboAddress& remote, const DNSName& zone, const
     else
       rr.qname=DNSName(qname);
 
-    if(!getFromTable("place", tmpnum))
-      rr.d_place = DNSResourceRecord::ANSWER;
-    else
-      rr.d_place = static_cast<DNSResourceRecord::Place>(tmpnum);
-
     /* removes 'value'; keeps 'key' for next iteration */
     lua_pop(d_lua, 1); // table
 
-    //    cerr<<"Adding content '"<<rr.content<<"' with place "<<(int)rr.d_place<<" \n";
+    //    cerr<<"Adding content '"<<rr.content<<"'\n";
     out.push_back(rr);
   }
   lua_pop(d_lua, 2); // c
diff --git a/pdns/lua-auth4.cc b/pdns/lua-auth4.cc
index 4263b730ad..6503e9cbd1 100644
--- a/pdns/lua-auth4.cc
+++ b/pdns/lua-auth4.cc
@@ -55,7 +55,6 @@ AuthLua4::AuthLua4(const std::string& fname) {
   d_lw->registerFunction<int(DNSResourceRecord::*)()>("domain_id", [](DNSResourceRecord& rec) { return rec.domain_id; });
   d_lw->registerFunction<uint16_t(DNSResourceRecord::*)()>("qtype", [](DNSResourceRecord& rec) { return rec.qtype.getCode(); });
   d_lw->registerFunction<uint16_t(DNSResourceRecord::*)()>("qclass", [](DNSResourceRecord& rec) { return rec.qclass; });
-  d_lw->registerFunction<int(DNSResourceRecord::*)()>("d_place", [](DNSResourceRecord& rec) { return rec.d_place; });
   d_lw->registerFunction<uint8_t(DNSResourceRecord::*)()>("scopeMask", [](DNSResourceRecord& rec) { return rec.scopeMask; });
   d_lw->registerFunction<bool(DNSResourceRecord::*)()>("auth", [](DNSResourceRecord& rec) { return rec.auth; });
   d_lw->registerFunction<bool(DNSResourceRecord::*)()>("disabled", [](DNSResourceRecord& rec) { return rec.disabled; });
@@ -198,7 +197,7 @@ AuthLua4::AuthLua4(const std::string& fname) {
       stubDoResolve(DNSName(qname), qtype, ret);
       int i = 0;
       for(const auto &row: ret) {
-        luaResult[++i] = DNSResourceRecord(row.dr);
+        luaResult[++i] = DNSResourceRecord::fromWire(row.dr);
         luaResult[i].auth = row.auth;
       }
       return luaResult;