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 c5e2c290f..648b80420 100644
--- a/data/example_new.conf
+++ b/data/example_new.conf
@@ -738,4 +738,11 @@ operserv
* is optional.
*/
#killonsgline = yes
+
+ /*
+ * If set, this option will make Services send an (SVS)KILL command immediately after SQLINE ADD.
+ * This eliminates the need for killingthe user after the SQLINE has been added. This directive
+ * is optional.
+ */
+ #killonsqline = yes
}
diff --git a/include/extern.h b/include/extern.h
index 2e732a0b6..946e9135b 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -385,7 +385,7 @@ E time_t SQLineExpiry;
E time_t SZLineExpiry;
E bool AkillOnAdd;
E bool KillonSGline;
-E int KillonSQline;
+E bool KillonSQline;
E int DisableRaw;
E int WallOper;
E int WallBadOS;
diff --git a/src/config.c b/src/config.c
index a9752666a..e339009d5 100644
--- a/src/config.c
+++ b/src/config.c
@@ -191,7 +191,7 @@ time_t SQLineExpiry;
time_t SZLineExpiry;
bool AkillOnAdd;
bool KillonSGline;
-int KillonSQline;
+bool KillonSQline;
int WallOper;
int WallBadOS;
int WallOSGlobal;
@@ -654,6 +654,7 @@ int ServerConfig::Read(bool bail)
{"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},
+ {"operserv", "killonsqline", "no", new ValueContainerBool(&KillonSQline), 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
@@ -1261,7 +1262,6 @@ Directive directives[] = {
{"LogBot", {{PARAM_SET, PARAM_RELOAD, &LogBot}}},
{"KeepBackups", {{PARAM_INT, PARAM_RELOAD, &KeepBackups}}},
{"KeepLogs", {{PARAM_INT, PARAM_RELOAD, &KeepLogs}}},
- {"KillonSQline", {{PARAM_SET, PARAM_RELOAD, &KillonSQline}}},
{"AddAkiller", {{PARAM_SET, PARAM_RELOAD, &AddAkiller}}},
{"LimitSessions", {{PARAM_SET, 0, &LimitSessions}}},
{"LocalAddress", {{PARAM_STRING, 0, &LocalHost},