summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/example_new.conf11
-rw-r--r--src/config.c3
2 files changed, 12 insertions, 2 deletions
diff --git a/data/example_new.conf b/data/example_new.conf
index 264378bea..637e2bcb3 100644
--- a/data/example_new.conf
+++ b/data/example_new.conf
@@ -827,4 +827,15 @@ operserv
* optional, if not set, nothing will be sent.
*/
sessionlimitexceeded = "The session limit for your host %s has been exceeded."
+
+ /*
+ * Same as above, but should be used to provide a website address where users can find out more
+ * about session limits and how to go about applying for an exception. This directive is optional,
+ * if not set, nothing will be sent.
+ *
+ * Note: This directive has been intentionally commented out in an effort to remind you to change
+ * the URL it contains. It is recommended that you supply an address/URL where people can get help
+ * regarding session limits.
+ */
+ #sessionlimitdetailsloc = "Please visit http://your.website.url/ for more information about session limits."
}
diff --git a/src/config.c b/src/config.c
index e41487556..4408247d9 100644
--- a/src/config.c
+++ b/src/config.c
@@ -673,6 +673,7 @@ int ServerConfig::Read(bool bail)
{"operserv", "maxsessionlimit", "0", new ValueContainerInt(&MaxSessionLimit), DT_INTEGER, ValidateLimitSessions},
{"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},
{NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation}
};
/* These tags can occur multiple times, and therefore they have special code to read them
@@ -1321,8 +1322,6 @@ Directive directives[] = {
{"ServerDesc", {{PARAM_STRING, 0, &ServerDesc}}},
{"ServerName", {{PARAM_STRING, 0, &ServerName}}},
{"ServiceUser", {{PARAM_STRING, 0, &temp_userhost}}},
- {"SessionLimitDetailsLoc",
- {{PARAM_STRING, PARAM_RELOAD, &SessionLimitDetailsLoc}}},
{"OSOpersOnly", {{PARAM_SET, PARAM_RELOAD, &OSOpersOnly}}},
{"SessionAutoKillExpiry",
{{PARAM_TIME, PARAM_RELOAD, &SessionAutoKillExpiry}}},