From 39588f55881d7681b1f5e4b319fd30710c313890 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 26 Nov 2015 14:58:51 +0100
Subject: [PATCH] Allow the use of spaces to parse options

---
 pdns/pdns_recursor.cc | 2 +-
 pdns/receiver.cc      | 2 +-
 pdns/reczones.cc      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index bcd6d45c9..886a959cc 100644
--- 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 b729a48b6..4ad1e6d96 100644
--- 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 4f0237cd2..0493eece2 100644
--- 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, '=');
-- 
2.40.0