From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Sat, 5 Oct 2013 13:30:46 +0000 (+0200)
Subject: remove **db param from UeberBackend::createDomain
X-Git-Tag: rec-3.6.0-rc1~416^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d73ea845bc1fd83a45572464d0aae240a591fd8;p=pdns

remove **db param from UeberBackend::createDomain

Noticed that UeberBackend is a DNSBackend, but the signatures for
createDomain did not match. Removing the returned DNSBackend from
UeberBackend::createDomain is okay, because we need to call
getDomainInfo anyway, so we can insert a SOA record.
---

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index 7a1b596dd..c56af858b 100644
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -103,11 +103,10 @@ bool UeberBackend::getDomainInfo(const string &domain, DomainInfo &di)
   return false;
 }
 
-bool UeberBackend::createDomain(const string &domain, DNSBackend** db)
+bool UeberBackend::createDomain(const string &domain)
 {
   BOOST_FOREACH(DNSBackend* mydb, backends) {
     if(mydb->createDomain(domain)) {
-      *db = mydb;
       return true;
     }
   }
diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh
index 980cd5729..35fd71765 100644
--- a/pdns/ueberbackend.hh
+++ b/pdns/ueberbackend.hh
@@ -123,7 +123,7 @@ public:
   void getUnfreshSlaveInfos(vector<DomainInfo>* domains);
   void getUpdatedMasters(vector<DomainInfo>* domains);
   bool getDomainInfo(const string &domain, DomainInfo &di);
-  bool createDomain(const string &domain, DNSBackend** db);
+  bool createDomain(const string &domain);
   
   int addDomainKey(const string& name, const KeyData& key);
   bool getDomainKeys(const string& name, unsigned int kind, std::vector<KeyData>& keys);
diff --git a/pdns/ws.cc b/pdns/ws.cc
index 1ea34b983..d7ea5cebb 100644
--- a/pdns/ws.cc
+++ b/pdns/ws.cc
@@ -337,7 +337,7 @@ static string createOrUpdateZone(const string& zonename, bool onlyCreate, varmap
     return returnJSONError("Domain '"+zonename+"' already exists");
 
   if(!exists) {
-    if(!B.createDomain(zonename, &di.backend))
+    if(!B.createDomain(zonename))
       return returnJSONError("Creating domain '"+zonename+"' failed");
 
     if(!B.getDomainInfo(zonename, di))