diff options
| -rw-r--r-- | data/example_new.conf | 5 | ||||
| -rw-r--r-- | include/extern.h | 2 | ||||
| -rw-r--r-- | src/config.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/data/example_new.conf b/data/example_new.conf index 0243d60fe..d679b72c3 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -931,4 +931,9 @@ defcon * optional. */ #timeout = 15m + + /* + * If set, Services will send a global message on DefCon level changes. This directive is optional. + */ + #globalondefcon = yes } diff --git a/include/extern.h b/include/extern.h index 7cc0d234f..ef8502652 100644 --- a/include/extern.h +++ b/include/extern.h @@ -509,7 +509,7 @@ E int DefConSessionLimit; E time_t DefConTimeOut; E time_t DefConAKILL; E char *DefConChanModes; -E int GlobalOnDefcon; +E bool GlobalOnDefcon; E int GlobalOnDefconMore; E char *DefconMessage; E char *DefConAkillReason; diff --git a/src/config.c b/src/config.c index fc0c4c6cd..fb3c484e1 100644 --- a/src/config.c +++ b/src/config.c @@ -289,7 +289,7 @@ time_t DefConTimeOut; int DefConSessionLimit; time_t DefConAKILL; char *DefConChanModes; -int GlobalOnDefcon; +bool GlobalOnDefcon; int GlobalOnDefconMore; char *DefConOffMessage; char *DefconMessage; @@ -704,6 +704,7 @@ int ServerConfig::Read(bool bail) {"defcon", "akillexpire", "0", new ValueContainerTime(&DefConAKILL), DT_TIME, ValidateDefCon}, {"defcon", "chanmodes", "", new ValueContainerChar(&DefConChanModes), DT_CHARPTR, ValidateDefCon}, {"defcon", "timeout", "0", new ValueContainerTime(&DefConTimeOut), DT_TIME, NoValidation}, + {"defcon", "globalondefcon", "no", new ValueContainerBool(&GlobalOnDefcon), 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 @@ -1361,7 +1362,6 @@ Directive directives[] = { {"UseTS6", {{PARAM_SET, 0, &UseTS6}}}, {"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}}, {"WarningTimeout", {{PARAM_TIME, PARAM_RELOAD, &WarningTimeout}}}, - {"GlobalOnDefcon", {{PARAM_SET, PARAM_RELOAD, &GlobalOnDefcon}}}, {"GlobalOnDefconMore", {{PARAM_SET, PARAM_RELOAD, &GlobalOnDefconMore}}}, {"DefconMessage", {{PARAM_STRING, PARAM_RELOAD, &DefconMessage}}}, |