]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
revert r2573 as it broke things
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 8 Oct 2012 09:59:31 +0000 (09:59 +0000)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 8 Oct 2012 09:59:31 +0000 (09:59 +0000)
git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2782 d19b8d6e-7fed-0310-83ef-9ca221ded41b

pdns/arguments.cc

index eb9b5ea8b789c7d3558682f5a3e41e00bafab2f8..3e281197487cc1bf776de4092a9211d4e21b404e 100644 (file)
@@ -312,15 +312,8 @@ void ArgvMap::parseOne(const string &arg, const string &parseOnly, bool lax)
     if(pos && pos!=string::npos) 
       val=val.substr(pos);
 
-    if(parmIsset(var)) {
-      if(var != "launch")
-        params[var]=val;
-      else  {
-        if(!params[var].empty())
-          params[var]+=",";
-        params["launch"]+= val;
-      }
-    }
+    if(parmIsset(var))
+      params[var]=val;
     else
       if(!lax)
         throw ArgException("Trying to set unexisting parameter '"+var+"'");