From: Aki Tuomi <cmouse@desteem.org>
Date: Sun, 14 Jul 2013 16:39:39 +0000 (+0300)
Subject: Fixed argument handling
X-Git-Tag: rec-3.6.0-rc1~559^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3702b428c93a208d7002eb43807b4525c21c6ae6;p=thirdparty%2Fpdns.git

Fixed argument handling
---

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 849118c10d..bc3bd1a4bf 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -310,7 +310,6 @@ void ArgvMap::parseOne(const string &arg, const string &parseOnly, bool lax)
     { 
       var=arg.substr(2);
       val="";
-      d_cleared.insert(var);
     }
   else if(arg[0]=='-')
     {
@@ -326,16 +325,20 @@ void ArgvMap::parseOne(const string &arg, const string &parseOnly, bool lax)
     pos=val.find_first_not_of(" \t");  // strip leading whitespace
     if(pos && pos!=string::npos)
       val=val.substr(pos);
-
+    if (!incremental && val.empty()) d_cleared.insert(var);
     if(parmIsset(var)) {
-      if (incremental && !d_cleared.count(var)) {
-         if (params[var].empty()) {
+      if (incremental) {
+         if (params[var].empty() && !d_cleared.count(var)) {
            throw ArgException("Incremental parameter '"+var+"' without a parent");
          }
-         params[var]+=val; 
-      } else 
+         if (params[var].empty())
+            params[var]=val;
+         else
+            params[var]+=", " + val; 
+      } else {
          params[var]=val;
       }
+    }
     else
       if(!lax)
         throw ArgException("Trying to set unexisting parameter '"+var+"'");