diff options
| -rw-r--r-- | src/configreader.cpp | 2 | ||||
| -rw-r--r-- | src/server.cpp | 12 |
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; } |