From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 8 Oct 2012 09:59:31 +0000 (+0000)
Subject: revert r2573 as it broke things
X-Git-Tag: auth-3.2-rc1~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50e83e03673170421039f9df1cc55bdace2d4a3a;p=thirdparty%2Fpdns.git

revert r2573 as it broke things

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

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index eb9b5ea8b7..3e28119748 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -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+"'");