summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/example_new.conf6
-rw-r--r--include/extern.h2
-rw-r--r--src/config.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/data/example_new.conf b/data/example_new.conf
index 9de4816fa..8a76f79cb 100644
--- a/data/example_new.conf
+++ b/data/example_new.conf
@@ -851,4 +851,10 @@ operserv
* directive is optional, if not set, defaults to 30 minutes.
*/
sessionautokillexpiry = 30m
+
+ /*
+ * Adds the nickname of the IRC Operator issuing an AKILL to the kill reason. This directive is
+ * optional.
+ */
+ addakiller = yes
}
diff --git a/include/extern.h b/include/extern.h
index e481f55cc..fc39cffaf 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -409,7 +409,7 @@ E bool WallDrop;
E bool WallForbid;
E bool WallGetpass;
E bool WallSetpass;
-E int AddAkiller;
+E bool AddAkiller;
E int parse_directive(Directive * d, char *dir, int ac, char *av[MAXPARAMS], int linenum, int reload, char *s);
diff --git a/src/config.c b/src/config.c
index 33e61fbdc..c7825a5e1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -215,7 +215,7 @@ bool WallDrop;
bool WallForbid;
bool WallGetpass;
bool WallSetpass;
-int AddAkiller;
+bool AddAkiller;
bool LimitSessions;
int DefSessionLimit;
@@ -676,6 +676,7 @@ int ServerConfig::Read(bool bail)
{"operserv", "sessionlimitdetailsloc", "", new ValueContainerChar(&SessionLimitDetailsLoc), DT_CHARPTR, NoValidation},
{"operserv", "maxsessionkill", "0", new ValueContainerInt(&MaxSessionKill), DT_INTEGER, NoValidation},
{"operserv", "sessionautokillexpiry", "0", new ValueContainerTime(&SessionAutoKillExpiry), DT_TIME, NoValidation},
+ {"operserv", "addakiller", "no", new ValueContainerBool(&AddAkiller), DT_BOOLEAN, NoValidation},
{NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation}
};
/* These tags can occur multiple times, and therefore they have special code to read them
@@ -1280,7 +1281,6 @@ Directive directives[] = {
{"LogBot", {{PARAM_SET, PARAM_RELOAD, &LogBot}}},
{"KeepBackups", {{PARAM_INT, PARAM_RELOAD, &KeepBackups}}},
{"KeepLogs", {{PARAM_INT, PARAM_RELOAD, &KeepLogs}}},
- {"AddAkiller", {{PARAM_SET, PARAM_RELOAD, &AddAkiller}}},
{"LocalAddress", {{PARAM_STRING, 0, &LocalHost},
{PARAM_PORT, PARAM_OPTIONAL, &LocalPort}}},
{"LogUsers", {{PARAM_SET, PARAM_RELOAD, &LogUsers}}},