Merge pull request #1184 from mind04/supermaster

More supermaster stuff

diff --cc modules/goraclebackend/goraclebackend.cc
Simple merge

diff --cc modules/oraclebackend/oraclebackend.cc
Simple merge

diff --cc modules/oraclebackend/oraclebackend.hh
Simple merge

diff --cc pdns/ueberbackend.cc
index 2c390a8f8845123b1b97c9c5c90306a576ec11cf,27d7a692f569a7d4c692a456206b646676154343..8fdebc89e7fd0ad125a0b4b5d6a81285d0079ef5
--- 1/pdns/ueberbackend.cc
--- 2/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)

diff --cc pdns/ueberbackend.hh
Simple merge