From: Ruben d'Arco <cyclops@prof-x.net>
Date: Thu, 29 Aug 2013 18:51:08 +0000 (+0200)
Subject: Also controlsocket file with pdns_ prefix.
X-Git-Tag: rec-3.6.0-rc1~496^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F981%2Fhead;p=thirdparty%2Fpdns.git

Also controlsocket file with pdns_ prefix.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 5e4fbf13aa..d52ac2db6c 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -695,7 +695,7 @@ void startDoResolve(void *p)
 
 void makeControlChannelSocket(int processNum=-1)
 {
-  string sockname=::arg()["socket-dir"]+"/"+s_programname;
+  string sockname=::arg()["socket-dir"]+"/pdns_"+s_programname;
   if(processNum >= 0)
     sockname += "."+lexical_cast<string>(processNum);
   sockname+=".controlsocket";
diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc
index 852b2bb03c..3f6425fb11 100644
--- a/pdns/rec_control.cc
+++ b/pdns/rec_control.cc
@@ -67,7 +67,7 @@ try
 {
   initArguments(argc, argv);
   RecursorControlChannel rccS;
-  string sockname="recursor";
+  string sockname="pdns_recursor";
 
   if (arg()["config-name"] != "")
     sockname+="-"+arg()["config-name"];