]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Fix for max() args and variable name
authorPavel Boldin <boldin.pavel@gmail.com>
Thu, 27 Jun 2013 22:03:04 +0000 (02:03 +0400)
committerPavel Boldin <boldin.pavel@gmail.com>
Fri, 6 Sep 2013 11:36:24 +0000 (15:36 +0400)
pdns/backends/bind/bindbackend2.cc

index 59645abecbb6f13640685a5662cc0c6eb830eb6c..21c5f0bed731fdc488009f9ed5cc4e01a7614a68 100644 (file)
@@ -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;
     }