From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sun, 5 Apr 2009 19:45:37 +0000 (+0000)
Subject: make sure we don't set export-etc-hosts to 'on' on reload-zones. Discovered by paul... 
X-Git-Tag: rec-3.2~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f64de5014e2434bceddc983be1dd0c9853fe236c;p=thirdparty%2Fpdns.git

make sure we don't set export-etc-hosts to 'on' on reload-zones. Discovered by paul AT cairney.me.uk
Closes ticket 225


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

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 30e4b9496a..81acb57529 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -341,9 +341,9 @@ void ArgvMap::preParse(int &argc, char **argv, const string &arg)
   }
 }
 
-bool ArgvMap::preParseFile(const char *fname, const string &arg)
+bool ArgvMap::preParseFile(const char *fname, const string &arg, const string& theDefault)
 {
-  params[arg].clear();
+  params[arg]=theDefault;
 
   ifstream f(fname);
   if(!f)
diff --git a/pdns/arguments.hh b/pdns/arguments.hh
index 4dd81fc6a4..c4e1e3e38a 100644
--- a/pdns/arguments.hh
+++ b/pdns/arguments.hh
@@ -82,7 +82,7 @@ public:
     parse(argc,argv,true);
   }
   void preParse(int &argc, char **argv, const string &arg); //!< use this to preparse a single var
-  bool preParseFile(const char *fname, const string &arg); //!< use this to preparse a single var in configuration
+  bool preParseFile(const char *fname, const string &arg, const string& theDefault=""); //!< use this to preparse a single var in configuration
 
   bool file(const char *fname, bool lax=false); //!< Parses a file with parameters
   bool laxFile(const char *fname) 
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 94e573c36f..3ab24b6513 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1485,7 +1485,7 @@ string reloadAuthAndForwards()
       L<<Logger::Warning<<"Unable to re-parse configuration file '"<<configname<<"'"<<endl;
     
     ::arg().preParseFile(configname.c_str(), "auth-zones");
-    ::arg().preParseFile(configname.c_str(), "export-etc-hosts");
+    ::arg().preParseFile(configname.c_str(), "export-etc-hosts", "off");
     ::arg().preParseFile(configname.c_str(), "serve-rfc1918");
     
     parseAuthAndForwards();