summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2010-02-16 00:48:10 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2010-02-16 00:48:10 +0000
commit7d1378e153be701768a656d42f0f6fbfe5ac5645 (patch)
tree3dc6996b592f375a0c658d1e1605468a442ef131 /src
parent55808216a859688506a879f6197ca1abd2f51d1b (diff)
Remove SYSTEM and related sensitive information from the non-oper VERSION line
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12471 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/configreader.cpp2
-rw-r--r--src/server.cpp12
2 files changed, 4 insertions, 10 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 5b430afe1..6f576fcd7 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -451,7 +451,7 @@ void ServerConfig::Fill()
DisabledCommands = ConfValue("disabled")->getString("commands", "");
DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
UserStats = security->getString("userstats");
- CustomVersion = security->getString("customversion");
+ CustomVersion = security->getString("customversion", Network + " IRCd");
HideSplits = security->getBool("hidesplits");
HideBans = security->getBool("hidebans");
HideWhoisServer = security->getString("hidewhois");
diff --git a/src/server.cpp b/src/server.cpp
index 339beff7a..822b46624 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -11,8 +11,6 @@
* ---------------------------------------------------
*/
-/* $Core */
-
#include <signal.h>
#include "exitcodes.h"
#include "inspircd.h"
@@ -62,14 +60,10 @@ void RehashHandler::Call(const std::string &reason)
std::string InspIRCd::GetVersionString(bool operstring)
{
char versiondata[MAXBUF];
- if (!operstring && !Config->CustomVersion.empty())
- {
- snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s",Config->ServerName.c_str(),Config->CustomVersion.c_str());
- }
+ if (operstring)
+ snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION,Config->ServerName.c_str(),SYSTEM,REVISION,SE->GetName().c_str(),Config->sid.c_str());
else
- {
- snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s (%s) [FLAGS=%s,%s,%s]",Config->ServerName.c_str(),SYSTEM,VERSION,REVISION,SE->GetName().c_str(),Config->sid.c_str());
- }
+ snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s",Config->ServerName.c_str(),Config->CustomVersion.c_str());
return versiondata;
}