From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 18 Sep 2017 06:43:57 +0000 (+0300)
Subject: bindbackend: Return false if domain_id is negative
X-Git-Tag: rec-4.1.0-rc1~33^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89cb3e71d9f22a777778fe191bb918a2926ccbd9;p=thirdparty%2Fpdns.git

bindbackend: Return false if domain_id is negative

It should return false, because it has effectively failed.
Returning true can cause several problems later on as
various functions assume they have valid file handle pointer
and valid domain ID to look up, which they don't.
---

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index e192ffd90f..606ac23685 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -193,7 +193,7 @@ bool Bind2Backend::startTransaction(const DNSName &qname, int id)
   if(id < 0) {
     d_transaction_tmpname.clear();
     d_transaction_id=id;
-    return true;
+    return false;
   }
   if(id == 0) {
     throw DBException("domain_id 0 is invalid for this backend.");
@@ -209,7 +209,6 @@ bool Bind2Backend::startTransaction(const DNSName &qname, int id)
       unlink(d_transaction_tmpname.c_str());
       delete d_of;
       d_of=0;
-      return false;
     }
     
     *d_of<<"; Written by PowerDNS, don't edit!"<<endl;
@@ -223,7 +222,7 @@ bool Bind2Backend::startTransaction(const DNSName &qname, int id)
 bool Bind2Backend::commitTransaction()
 {
   if(d_transaction_id < 0)
-    return true;
+    return false;
   delete d_of;
   d_of=0;