summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/example_new.conf5
-rw-r--r--src/config.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/data/example_new.conf b/data/example_new.conf
index 705879b78..cbc055639 100644
--- a/data/example_new.conf
+++ b/data/example_new.conf
@@ -400,4 +400,9 @@ chanserv
* The maximum number of entries on a channel's autokick list.
*/
autokickmax = 32
+
+ /*
+ * The default reason for an autokick if none is given.
+ */
+ autokickreason = "User has been banned from the channel"
}
diff --git a/src/config.c b/src/config.c
index 2d069bb5c..8e584dfcf 100644
--- a/src/config.c
+++ b/src/config.c
@@ -588,6 +588,7 @@ int ServerConfig::Read(bool bail)
{"chanserv", "defbantype", "2", new ValueContainerInt(&CSDefBantype), DT_INTEGER, ValidateBantype},
{"chanserv", "accessmax", "0", new ValueContainerInt(&CSAccessMax), DT_INTEGER, ValidateNotZero},
{"chanserv", "autokickmax", "0", new ValueContainerInt(&CSAutokickMax), DT_INTEGER, ValidateNotZero},
+ {"chanserv", "autokickreason", "User has been banned from the channel", new ValueContainerChar(&CSAutokickReason), DT_CHARPTR, ValidateNotEmpty},
{NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation}
};
/* These tags can occur multiple times, and therefore they have special code to read them
@@ -1189,8 +1190,6 @@ Directive directives[] = {
{"HostServName", {{PARAM_STRING, 0, &s_HostServ},
{PARAM_STRING, 0, &desc_HostServ}}},
{"ChanCoreModules", {{PARAM_STRING, PARAM_RELOAD, &ChanCoreModules}}},
- {"CSAutokickReason",
- {{PARAM_STRING, PARAM_RELOAD, &CSAutokickReason}}},
{"CSInhabit", {{PARAM_TIME, PARAM_RELOAD, &CSInhabit}}},
{"CSListMax", {{PARAM_POSINT, PARAM_RELOAD, &CSListMax}}},
{"CSListOpersOnly", {{PARAM_SET, PARAM_RELOAD, &CSListOpersOnly}}},
@@ -1693,7 +1692,6 @@ int read_config(int reload)
CHECK(ReadTimeout);
CHECK(WarningTimeout);
CHECK(TimeoutCheck);
- CHECK(CSAutokickReason);
CHECK(CSInhabit);
CHECK(CSListMax);
CHECK(ServicesRoot);