From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 21 Oct 2014 10:05:21 +0000 (+0200)
Subject: Revert "make sure we don't launch the query distribution thread if configured to... 
X-Git-Tag: rec-3.7.0-rc1~199^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c535aeae49b630297c906465941687692c9410;p=thirdparty%2Fpdns.git

Revert "make sure we don't launch the query distribution thread if configured to run unthreaded"

This reverts commit cfc99d7ea24aa40ca0d8cabd11ca2257626197bf.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index e0784af9ac..1c43143e1f 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1911,9 +1911,7 @@ int serviceMain(int argc, char*argv[])
   }
 
   Utility::dropUserPrivs(newuid);
-  g_numThreads = ::arg().asNum("threads");
-  if(g_numThreads > 1)
-    g_numThreads += ::arg().mustDo("pdns-distributes-queries"); 
+  g_numThreads = ::arg().asNum("threads") + ::arg().mustDo("pdns-distributes-queries");
   
   makeThreadPipes();