From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Thu, 4 Oct 2012 09:02:32 +0000 (+0000)
Subject: because we love debian - closes ticket 502
X-Git-Tag: auth-3.2-rc1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce12a5179504cc0eb11d23aba11e39ac322d58a3;p=thirdparty%2Fpdns.git

because we love debian - closes ticket 502


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

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 3e28119748..eb9b5ea8b7 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -312,8 +312,15 @@ void ArgvMap::parseOne(const string &arg, const string &parseOnly, bool lax)
     if(pos && pos!=string::npos) 
       val=val.substr(pos);
 
-    if(parmIsset(var))
-      params[var]=val;
+    if(parmIsset(var)) {
+      if(var != "launch")
+        params[var]=val;
+      else  {
+        if(!params[var].empty())
+          params[var]+=",";
+        params["launch"]+= val;
+      }
+    }
     else
       if(!lax)
         throw ArgException("Trying to set unexisting parameter '"+var+"'");