Allow the use of spaces to parse options

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index bcd6d45c96bcc54041a14af1b972012e59f3ebe0..886a959cc48d4061be5a9f1bd5489ff1d3dbcdc4 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2096,7 +2096,7 @@ boost::optional<Netmask> getEDNSSubnetMask(const ComboAddress& local, const DNSN
 void  parseEDNSSubnetWhitelist(const std::string& wlist)
 {
   vector<string> parts;
-  stringtok(parts, wlist, ",;");
+  stringtok(parts, wlist, ",; ");
   for(const auto& a : parts) {
     try {
       Netmask nm(a);

diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index b729a48b63c4be4191c7650f120a4cb5deee644c..4ad1e6d966eebff0d09117795f01e429d891daa9 100644 (file)
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -359,7 +359,7 @@ static void loadModules()
   if(!::arg()["load-modules"].empty()) { 
     vector<string>modules;
     
-    stringtok(modules,::arg()["load-modules"],",");
+    stringtok(modules,::arg()["load-modules"],", ");
     
     for(vector<string>::const_iterator i=modules.begin();i!=modules.end();++i) {
       bool res;

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 4f0237cd2f6f9d2db92a6ca69ba6a87f698070d4..0493eece23b9dee7f0e1986562672d0e9b167da2 100644 (file)
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -374,14 +374,14 @@ void ixfrTracker(const ComboAddress& master, const DNSName& zone, shared_ptr<SOA
 void loadRPZFiles()
 {
   vector<string> fnames;
-  stringtok(fnames, ::arg()["rpz-files"],",");
+  stringtok(fnames, ::arg()["rpz-files"]," ,");
   int count=0;
   for(const auto& f : fnames) {
     loadRPZFromFile(f, g_dfe, count++);
   }
 
   fnames.clear();
-  stringtok(fnames, ::arg()["rpz-masters"],",");
+  stringtok(fnames, ::arg()["rpz-masters"]," ,");
 
   for(const auto& f : fnames) {
     auto s = splitField(f, ':');
@@ -406,7 +406,7 @@ SyncRes::domainmap_t* parseAuthAndForwards()
   const char *option_names[3]={"auth-zones", "forward-zones", "forward-zones-recurse"};
   for(int n=0; n < 3 ; ++n ) {
     parts.clear();
-    stringtok(parts, ::arg()[option_names[n]], ",\t\n\r");
+    stringtok(parts, ::arg()[option_names[n]], " ,\t\n\r");
     for(parts_t::const_iterator iter = parts.begin(); iter != parts.end(); ++iter) {
       SyncRes::AuthDomain ad;
       pair<string,string> headers=splitField(*iter, '=');