From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 22 Jan 2016 14:54:29 +0000 (+0100)
Subject: Merge pull request #2591 from cmouse/notify-tsig
X-Git-Tag: dnsdist-1.0.0-alpha2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da3b4144ed04879e07a9c7315b76731ee3c3e4a3;p=thirdparty%2Fpdns.git

Merge pull request #2591 from cmouse/notify-tsig

Sign NOTIFY with TSIG
---

da3b4144ed04879e07a9c7315b76731ee3c3e4a3
diff --cc pdns/backends/gsql/gsqlbackend.cc
index f3eaa42a84,f2130079cf..8aee00536b
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@@ -1100,10 -1100,10 +1100,10 @@@ bool GSQLBackend::superMasterBackend(co
          reset();
      }
      catch (SSqlException &e) {
 -      throw PDNSException("GSQLBackend unable to search for a domain: "+e.txtReason());
 +      throw DBException("GSQLBackend unable to search for a domain: "+e.txtReason());
      }
-     ASSERT_ROW_COLUMNS("supermaster-query", d_result[0], 1);
      if(!d_result.empty()) {
+       ASSERT_ROW_COLUMNS("supermaster-query", d_result[0], 1);
        *nameserver=i->content;
        *account=d_result[0][0];
        *ddb=this;