summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/example_new.conf7
-rw-r--r--include/extern.h2
-rw-r--r--src/config.c4
3 files changed, 10 insertions, 3 deletions
diff --git a/data/example_new.conf b/data/example_new.conf
index 0cb6c9811..c5e2c290f 100644
--- a/data/example_new.conf
+++ b/data/example_new.conf
@@ -731,4 +731,11 @@ operserv
* been added. This directive is optional.
*/
#akillonadd = yes
+
+ /*
+ * If set, this option will make Services send an (SVS)KILL command immediately after SGLINE ADD.
+ * This eliminates the need for killingthe user after the SGLINE has been added. This directive
+ * is optional.
+ */
+ #killonsgline = yes
}
diff --git a/include/extern.h b/include/extern.h
index 13bc85894..2e732a0b6 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -384,7 +384,7 @@ E time_t SGLineExpiry;
E time_t SQLineExpiry;
E time_t SZLineExpiry;
E bool AkillOnAdd;
-E int KillonSGline;
+E bool KillonSGline;
E int KillonSQline;
E int DisableRaw;
E int WallOper;
diff --git a/src/config.c b/src/config.c
index 9914b6d2b..a9752666a 100644
--- a/src/config.c
+++ b/src/config.c
@@ -190,7 +190,7 @@ time_t SGLineExpiry;
time_t SQLineExpiry;
time_t SZLineExpiry;
bool AkillOnAdd;
-int KillonSGline;
+bool KillonSGline;
int KillonSQline;
int WallOper;
int WallBadOS;
@@ -653,6 +653,7 @@ int ServerConfig::Read(bool bail)
{"operserv", "sqlineexpiry", "0", new ValueContainerTime(&SQLineExpiry), DT_TIME, ValidateNotZero},
{"operserv", "szlineexpiry", "0", new ValueContainerTime(&SZLineExpiry), DT_TIME, ValidateNotZero},
{"operserv", "akillonadd", "no", new ValueContainerBool(&AkillOnAdd), DT_BOOLEAN, NoValidation},
+ {"operserv", "killonsgline", "no", new ValueContainerBool(&KillonSGline), 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
@@ -1260,7 +1261,6 @@ Directive directives[] = {
{"LogBot", {{PARAM_SET, PARAM_RELOAD, &LogBot}}},
{"KeepBackups", {{PARAM_INT, PARAM_RELOAD, &KeepBackups}}},
{"KeepLogs", {{PARAM_INT, PARAM_RELOAD, &KeepLogs}}},
- {"KillonSGline", {{PARAM_SET, PARAM_RELOAD, &KillonSGline}}},
{"KillonSQline", {{PARAM_SET, PARAM_RELOAD, &KillonSQline}}},
{"AddAkiller", {{PARAM_SET, PARAM_RELOAD, &AddAkiller}}},
{"LimitSessions", {{PARAM_SET, 0, &LimitSessions}}},