Remove limitsomaxconn and remains of m_halfop/allowhalfop

2 files changed, 2 insertions, 11 deletions

diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index f6dc96ecd..23a87dc5e 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -655,14 +655,10 @@
              # in the accept queue. This is *NOT* the total maximum number of
              # connections per server. Some systems may only allow this to be up
              # to 5, while others (such as linux and *BSD) default to 128.
+             # Setting this above the limit imposed by your OS can have undesired
+             # effects.
              somaxconn="128"
 
-             # limitsomaxconn: By default, somaxconn (see above) is limited to a
-             # safe maximum value in the 2.0 branch for compatibility reasons.
-             # This setting can be used to disable this limit, forcing InspIRCd
-             # to use the value specifed above.
-             limitsomaxconn="true"
-
              # softlimit: This optional feature allows a defined softlimit for
              # connections. If defined, it sets a soft max connections value.
              softlimit="12800"
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 905eb786a..427bc79bf 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -433,8 +433,6 @@ void ServerConfig::Fill()
 	NoSnoticeStack = options->getBool("nosnoticestack", false);
 
 	range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), "<performance:softlimit>");
-	if (ConfValue("performance")->getBool("limitsomaxconn", true))
-		range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
 	range(MaxTargets, 1, 31, 20, "<security:maxtargets>");
 	range(NetBufferSize, 1024, 65534, 10240, "<performance:netbuffersize>");
 
@@ -694,9 +692,6 @@ void ServerConfig::ApplyModules(User* user)
 		}
 	}
 
-	if (ConfValue("options")->getBool("allowhalfop") && removed_modules.erase("m_halfop.so") == 0)
-		added_modules.push_back("m_halfop.so");
-
 	for (std::set<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
 	{
 		// Don't remove cmd_*.so, just remove m_*.so