]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
fix feedEnt query
authorKees Monshouwer <mind04@monshouwer.org>
Mon, 14 Apr 2014 06:54:21 +0000 (08:54 +0200)
committermind04 <mind04@monshouwer.org>
Mon, 14 Apr 2014 06:59:47 +0000 (08:59 +0200)
pdns/backends/gsql/gsqlbackend.cc

index 6bf664725fa71533119c9dd8e6654aa326f95ee2..69cb4c1f1ead8150b1eefa4b515d8d2437cb2db5 100644 (file)
@@ -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);