From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sat, 11 Mar 2006 21:38:52 +0000 (+0000)
Subject: arg() is sat upon by the boost::multi_index namespace
X-Git-Tag: pdns-2.9.20~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84de7c8ac67d4df61d0df250f8b4263504d4d40d;p=thirdparty%2Fpdns.git

arg() is sat upon by the boost::multi_index namespace


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@578 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index edb50935fb..69dcb691f7 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -461,7 +461,7 @@ int SyncRes::doResolveAt(set<string> nameservers, string auth, const string &qna
 	}
 	
 	if(endsOn(i->qname, auth)) {
-	  if(d_lwr.d_aabit && d_lwr.d_rcode==RCode::NoError && i->d_place==DNSResourceRecord::ANSWER && arg().contains("delegation-only",auth)) {
+	  if(d_lwr.d_aabit && d_lwr.d_rcode==RCode::NoError && i->d_place==DNSResourceRecord::ANSWER && ::arg().contains("delegation-only",auth)) {
 	    LOG<<"NO! Is from delegation-only zone"<<endl;
 	    s_nodelegated++;
 	    return RCode::NXDomain;
@@ -597,7 +597,7 @@ void SyncRes::addCruft(const string &qname, vector<DNSResourceRecord>& ret)
 
   LOG<<d_prefix<<qname<<": Starting additional processing"<<endl;
   vector<DNSResourceRecord> addit;
-  bool doIPv6AP=arg().mustDo("aaaa-additional-processing");
+  bool doIPv6AP=::arg().mustDo("aaaa-additional-processing");
   for(vector<DNSResourceRecord>::const_iterator k=ret.begin();k!=ret.end();++k) 
     if((k->d_place==DNSResourceRecord::ANSWER && k->qtype==QType(QType::MX)) || 
        ((k->d_place==DNSResourceRecord::AUTHORITY || k->d_place==DNSResourceRecord::ANSWER) && k->qtype==QType(QType::NS))) {