summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/configreader.cpp2
-rw-r--r--src/usermanager.cpp4
-rw-r--r--src/xline.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index e697113e2..d7d448bc4 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -377,7 +377,7 @@ void ServerConfig::Fill()
SoftLimit = ConfValue("performance")->getInt("softlimit", ServerInstance->SE->GetMaxFds(), 10, ServerInstance->SE->GetMaxFds());
CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
MaxConn = ConfValue("performance")->getInt("somaxconn", SOMAXCONN);
- MoronBanner = options->getString("moronbanner", "You're banned!");
+ XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
ServerDesc = ConfValue("server")->getString("description", "Configure Me");
Network = ConfValue("server")->getString("network", "Network");
AdminName = ConfValue("admin")->getString("name", "");
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 605bc1f69..538feaade 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -129,8 +129,8 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
{
/* user banned */
ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
- if (!ServerInstance->Config->MoronBanner.empty())
- New->WriteNotice("*** " + ServerInstance->Config->MoronBanner);
+ if (!ServerInstance->Config->XLineMessage.empty())
+ New->WriteNotice("*** " + ServerInstance->Config->XLineMessage);
this->QuitUser(New, b->Reason);
return;
}
diff --git a/src/xline.cpp b/src/xline.cpp
index 44ae1e98e..bc8e596bd 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -533,8 +533,8 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
{
const std::string banReason = line + "-Lined: " + reason;
- if (!ServerInstance->Config->MoronBanner.empty())
- u->WriteNotice("*** " + ServerInstance->Config->MoronBanner);
+ if (!ServerInstance->Config->XLineMessage.empty())
+ u->WriteNotice("*** " + ServerInstance->Config->XLineMessage);
if (ServerInstance->Config->HideBans)
ServerInstance->Users->QuitUser(u, line + "-Lined", banReason.c_str());