From: Pavel Boldin <boldin.pavel@gmail.com>
Date: Thu, 27 Jun 2013 22:03:04 +0000 (+0400)
Subject: Fix for max() args and variable name
X-Git-Tag: rec-3.6.0-rc1~457^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0eeca6c08dde2c6fd5d3acbf1c8e3e0fc4279cd0;p=thirdparty%2Fpdns.git

Fix for max() args and variable name
---

diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 59645abecb..21c5f0bed7 100644
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -424,10 +424,10 @@ void Bind2Backend::insert(shared_ptr<State> stage, int id, const string &qnameu,
   if(bb2.d_name.empty())
     ;
   else if(dottedEndsOn(bdr.qname, bb2.d_name))
-    bdr.qname.resize(max(0, bdr.qname.length() - (bb2.d_name.length() + 1)));
+    bdr.qname.resize(max(0, static_cast<int>(bdr.qname.length() - (bb2.d_name.length() + 1))));
   else {
     string msg = "Trying to insert non-zone data, name='"+bdr.qname+"', qtype="+qtype.getName()+", zone='"+bb2.d_name+"'";
-    if(ignore_non_zone) {
+    if(s_ignore_broken_records) {
         L<<Logger::Warning<<msg<< " ignored" << endl;
         return;
     }