From: Peter van Dijk <peter@7bits.nl>
Date: Mon, 6 Jan 2014 08:29:52 +0000 (-0800)
Subject: Merge pull request #1184 from mind04/supermaster
X-Git-Tag: rec-3.6.0-rc1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c5a2e4cb2382da1fdffe5eef00ee2289d3cd895;p=thirdparty%2Fpdns.git

Merge pull request #1184 from mind04/supermaster

More supermaster stuff
---

5c5a2e4cb2382da1fdffe5eef00ee2289d3cd895
diff --cc pdns/ueberbackend.cc
index 2c390a8f88,27d7a692f5..8fdebc89e7
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@@ -342,14 -297,12 +342,13 @@@ bool UeberBackend::getSOA(const string 
    return false;
  }
  
- bool UeberBackend::superMasterBackend(const string &ip, const string &domain, const vector<DNSResourceRecord>&nsset, string *account, DNSBackend **db)
+ bool UeberBackend::superMasterBackend(const string &ip, const string &domain, const vector<DNSResourceRecord>&nsset, string *nameserver, string *account, DNSBackend **db)
  {
 +  check_op_requests();
    for(vector<DNSBackend *>::const_iterator i=backends.begin();i!=backends.end();++i)
-     if((*i)->superMasterBackend(ip,domain,nsset,account, db))
+     if((*i)->superMasterBackend(ip, domain, nsset, nameserver, account, db))
        return true;
    return false;
- 
  }
  
  void UeberBackend::setStatus(const string &st)