Added maxsessionkill directive to operserv block in new config.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1487 5417fbe8-f217-4b02-8779-1006273d7864

data/example_new.conf

@@ -838,4 +838,11 @@ operserv
 	 * regarding session limits.
 	 */
 	#sessionlimitdetailsloc = "Please visit http://your.website.url/ for more information about session limits."
+
+	/*
+	 * If set and is not 0, this directive tells Services to add an AKILL the number of subsequent kills
+	 * for the same host exceeds this value, preventing the network from experiencing KILL floods. This
+	 * directive is optional.
+	 */
+	maxsessionkill = 15
 }

src/config.c

@@ -674,6 +674,7 @@ int ServerConfig::Read(bool bail)
 		{"operserv", "exceptionexpiry", "0", new ValueContainerTime(&ExceptionExpiry), DT_TIME, ValidateLimitSessions},
 		{"operserv", "sessionlimitexceeded", "", new ValueContainerChar(&SessionLimitExceeded), DT_CHARPTR, NoValidation},
 		{"operserv", "sessionlimitdetailsloc", "", new ValueContainerChar(&SessionLimitDetailsLoc), DT_CHARPTR, NoValidation},
+		{"operserv", "maxsessionkill", "0", new ValueContainerInt(&MaxSessionKill), DT_INTEGER, NoValidation},
 		{NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation}
 	};
 	/* These tags can occur multiple times, and therefore they have special code to read them
@@ -1283,7 +1284,6 @@ Directive directives[] = {
                       {PARAM_PORT, PARAM_OPTIONAL, &LocalPort}}},
     {"LogUsers", {{PARAM_SET, PARAM_RELOAD, &LogUsers}}},
     {"MailDelay", {{PARAM_TIME, PARAM_RELOAD, &MailDelay}}},
-    {"MaxSessionKill", {{PARAM_INT, PARAM_RELOAD, &MaxSessionKill}}},
     {"MemoCoreModules", {{PARAM_STRING, PARAM_RELOAD, &MemoCoreModules}}},
     {"MysqlHost", {{PARAM_STRING, PARAM_RELOAD, &MysqlHost}}},
     {"MysqlUser", {{PARAM_STRING, PARAM_RELOAD, &MysqlUser}}},
@@ -1890,7 +1890,7 @@ int read_config(int reload)
 
     if (LimitSessions) {
         if (MaxSessionKill && !SessionAutoKillExpiry)
-            SessionAutoKillExpiry = 30 * 60;    /* 30 minutes */
+            SessionAutoKillExpiry = 1800;    /* 30 minutes */
     }
 
     if (s_BotServ) {