Also controlsocket file with pdns_ prefix.

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 5e4fbf13aa13fcce3b8e3fa707a4199c90b9ff64..d52ac2db6cf51297397d8b0424a67540caddfbc5 100644 (file)
--- 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 852b2bb03c2ce5bb57d0a692b4343669b36ed0de..3f6425fb11e4bbb935fcc9bb599b905ba5406a03 100644 (file)
--- 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"];