From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Mon, 24 Feb 2014 12:45:31 +0000 (+0100)
Subject: Recursor: restore correct syslog name
X-Git-Tag: rec-3.6.0-rc1~170^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d733c0fa47fd1fc67b37680c96c7bd623fa25c6;p=thirdparty%2Fpdns.git

Recursor: restore correct syslog name

Was broken since 5124de27a39e1ae6f143abdf146dff609880de0e.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 88b9b61a79..a4726d7181 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -110,7 +110,7 @@ __thread NetmaskGroup* t_allowFrom;
 static NetmaskGroup* g_initialAllowFrom; // new thread needs to be setup with this
 
 NetmaskGroup* g_dontQuery;
-string s_programname="recursor";
+string s_programname="pdns_recursor";
 
 typedef vector<int> tcpListenSockets_t;
 tcpListenSockets_t g_tcpListenSockets;   // shared across threads, but this is fine, never written to from a thread. All threads listen on all sockets
@@ -716,7 +716,7 @@ void startDoResolve(void *p)
 
 void makeControlChannelSocket(int processNum=-1)
 {
-  string sockname=::arg()["socket-dir"]+"/pdns_"+s_programname;
+  string sockname=::arg()["socket-dir"]+"/"+s_programname;
   if(processNum >= 0)
     sockname += "."+lexical_cast<string>(processNum);
   sockname+=".controlsocket";
@@ -1824,7 +1824,7 @@ int serviceMain(int argc, char*argv[])
       break;
   }
   
-  s_pidfname=::arg()["socket-dir"]+"/pdns_"+s_programname+".pid";
+  s_pidfname=::arg()["socket-dir"]+"/"+s_programname+".pid";
   if(!s_pidfname.empty())
     unlink(s_pidfname.c_str()); // remove possible old pid file 
   
@@ -2121,18 +2121,18 @@ int main(int argc, char **argv)
     L.toConsole(Logger::Info);
     ::arg().laxParse(argc,argv); // do a lax parse
 
-    if(::arg()["config-name"]!="") 
+    string configname=::arg()["config-dir"]+"/recursor.conf";
+    if(::arg()["config-name"]!="") {
+      configname=::arg()["config-dir"]+"/recursor-"+::arg()["config-name"]+".conf";
       s_programname+="-"+::arg()["config-name"];
-
+    }
+    cleanSlashes(configname);
 
     if(::arg().mustDo("config")) {
       cout<<::arg().configstring()<<endl;
       exit(0);
     }
 
-    string configname=::arg()["config-dir"]+"/"+s_programname+".conf";
-    cleanSlashes(configname);
-
     if(!::arg().file(configname.c_str())) 
       L<<Logger::Warning<<"Unable to parse configuration file '"<<configname<<"'"<<endl;