From: Kees Monshouwer <mind04@monshouwer.org>
Date: Mon, 14 Apr 2014 06:54:21 +0000 (+0200)
Subject: fix feedEnt query
X-Git-Tag: rec-3.6.0-rc1~61^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a48c6f96b1f6f1d8ecb63307ab27c48d55dd78c5;p=thirdparty%2Fpdns.git

fix feedEnt query
---

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index 6bf664725f..69cb4c1f1e 100644
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -1102,7 +1102,7 @@ bool GSQLBackend::feedRecord(const DNSResourceRecord &r, string *ordername)
              % (int)r.disabled
              % toLower(sqlEscape(r.qname))
              % sqlEscape(*ordername)
-             % (int)(r.auth || !d_dnssecQueries)
+             % (int)(r.auth)
       ).str();
   else
     query = (boost::format(d_InsertRecordQuery)
@@ -1132,17 +1132,11 @@ bool GSQLBackend::feedEnts(int domain_id, map<string,bool>& nonterm)
 
   BOOST_FOREACH(nt, nonterm) {
 
-    if (!d_dnssecQueries)
-      query = (boost::format(d_InsertEntQuery)
-               % domain_id
-               % toLower(sqlEscape(nt.first))
-       ).str();
-    else
-      query = (boost::format(d_InsertEntQuery)
-               % domain_id
-               % toLower(sqlEscape(nt.first))
-               % 1
-       ).str();
+    query = (boost::format(d_InsertEntQuery)
+             % domain_id
+             % toLower(sqlEscape(nt.first))
+             % (int)(nt.second || !d_dnssecQueries)
+      ).str();
 
     try {
       d_db->doCommand(query);