Forward port the removal of -nolimit (doesn't seem to be in the current command line stuff regardless?)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3815 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 11 insertions, 22 deletions

diff --git a/include/inspircd_io.h b/include/inspircd_io.h
index 531026778..9b9e1143a 100644
--- a/include/inspircd_io.h
+++ b/include/inspircd_io.h
@@ -189,14 +189,6 @@ class ServerConfig : public classbase
 	 */
         bool nofork;
 
-	/** If this value is true, the owner of the
-	 * server has chosen to unlimit the coredump
-	 * size to as large a value as his account
-	 * settings will allow. This is often used
-	 * when debugging.
-	 */
-        bool unlimitcore;
-
 	/** If this value is true, halfops have been
 	 * enabled in the configuration file.
 	 */
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 3ffa248a1..9e5f18706 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -52,7 +52,7 @@ ServerConfig::ServerConfig()
 	*CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
 	*OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
 	log_file = NULL;
-	OperSpyWhois = nofork = HideBans = HideSplits = unlimitcore = false;
+	OperSpyWhois = nofork = HideBans = HideSplits = false;
 	AllowHalfop = true;
 	dns_timeout = DieDelay = 5;
 	MaxTargets = 20;
@@ -901,20 +901,17 @@ bool DaemonSeed()
 	umask (007);
 	printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid());
 
-	if (Config->unlimitcore)
+	rlimit rl;
+	if (getrlimit(RLIMIT_CORE, &rl) == -1)
 	{
-		rlimit rl;
-		if (getrlimit(RLIMIT_CORE, &rl) == -1)
-		{
-			log(DEFAULT,"Failed to getrlimit()!");
-			return false;
-		}
-		else
-		{
-			rl.rlim_cur = rl.rlim_max;
-			if (setrlimit(RLIMIT_CORE, &rl) == -1)
-				log(DEFAULT,"setrlimit() failed, cannot increase coredump size.");
-		}
+		log(DEFAULT,"Failed to getrlimit()!");
+		return false;
+	}
+	else
+	{
+		rl.rlim_cur = rl.rlim_max;
+		if (setrlimit(RLIMIT_CORE, &rl) == -1)
+			log(DEFAULT,"setrlimit() failed, cannot increase coredump size.");
 	}
   
 	return true;