From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Sat, 5 Oct 2013 13:38:04 +0000 (+0200)
Subject: bind2: rename createDomain to createDomainEntry
X-Git-Tag: rec-3.6.0-rc1~416^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebdc28f481216200e7c8bbf388f474fb27114cc7;p=pdns

bind2: rename createDomain to createDomainEntry

Bind2Backend::createDomain was hiding DNSBackend::createDomain, but with
completely different functionality. (Bind2Backend::createDomain was there
first.)
---

diff --git a/pdns/backends/bind/bindbackend2.cc b/pdns/backends/bind/bindbackend2.cc
index 5c19bc958..957634cd3 100644
--- a/pdns/backends/bind/bindbackend2.cc
+++ b/pdns/backends/bind/bindbackend2.cc
@@ -575,7 +575,7 @@ string Bind2Backend::DLAddDomainHandler(const vector<string>&parts, Utility::pid
   Lock l(&s_state_lock);
 
   Bind2Backend bb2;
-  BB2DomainInfo& bbd = bb2.createDomain(domainname, filename);
+  BB2DomainInfo& bbd = bb2.createDomainEntry(domainname, filename);
 
   bbd.d_filename=filename;
   bbd.d_checknow=true;
@@ -714,7 +714,7 @@ void Bind2Backend::doEmptyNonTerminals(shared_ptr<State> stage, int id, bool nse
 
 void Bind2Backend::loadConfig(string* status)
 {
-  // Interference with createDomain()
+  // Interference with createDomainEntry()
   Lock l(&s_state_lock);
 
   static int domain_id=1;
@@ -1313,7 +1313,7 @@ bool Bind2Backend::superMasterBackend(const string &ip, const string &domain, co
 }
 
 // NEED TO CALL THIS with s_state_lock held!
-BB2DomainInfo &Bind2Backend::createDomain(const string &domain, const string &filename)
+BB2DomainInfo &Bind2Backend::createDomainEntry(const string &domain, const string &filename)
 {
   int newid=1;
   // Find a free zone id nr.  
@@ -1360,7 +1360,7 @@ bool Bind2Backend::createSlaveDomain(const string &ip, const string &domain, con
   c_of << "};" << endl;
   c_of.close();
 
-  BB2DomainInfo &bbd = createDomain(canonic(domain), filename);
+  BB2DomainInfo &bbd = createDomainEntry(canonic(domain), filename);
 
   bbd.d_masters.push_back(ip);
   
diff --git a/pdns/backends/bind/bindbackend2.hh b/pdns/backends/bind/bindbackend2.hh
index 61b7edf1e..8ed6bafaa 100644
--- a/pdns/backends/bind/bindbackend2.hh
+++ b/pdns/backends/bind/bindbackend2.hh
@@ -231,7 +231,7 @@ private:
 
   set<string> alsoNotify; //!< this is used to store the also-notify list of interested peers.
 
-  BB2DomainInfo& createDomain(const string &domain, const string &filename);
+  BB2DomainInfo& createDomainEntry(const string &domain, const string &filename);
 
   int d_transaction_id;
   string d_transaction_tmpname;