diff options
| -rw-r--r-- | data/example_new.conf | 6 | ||||
| -rw-r--r-- | src/config.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/data/example_new.conf b/data/example_new.conf index d515fd22d..e3f78a196 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -678,4 +678,10 @@ operserv * executable. If not given, defaults to "news.db". */ newsdatabase = "news.db" + + /* + * The filename of OperServ's Session Exception database. The path is relative to the services + * executable. If not given, defaults to "exception.db". + */ + exceptiondatabase = "exception.db" } diff --git a/src/config.c b/src/config.c index 1861e361d..1c582d691 100644 --- a/src/config.c +++ b/src/config.c @@ -642,6 +642,7 @@ int ServerConfig::Read(bool bail) {"operserv", "globaldescription", "Global Noticer", new ValueContainerChar(&desc_GlobalNoticer), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"operserv", "database", "oper.db", new ValueContainerChar(&OperDBName), DT_CHARPTR, ValidateNotEmpty}, {"operserv", "newsdatabase", "news.db", new ValueContainerChar(&NewsDBName), DT_CHARPTR, ValidateNotEmpty}, + {"operserv", "exceptiondatabase", "exception.db", new ValueContainerChar(&ExceptionDBName), 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 @@ -1243,7 +1244,6 @@ Directive directives[] = { {"DefConOffMessage", {{PARAM_STRING, PARAM_RELOAD, &DefConOffMessage}}}, {"EncModule", {{PARAM_STRING, 0, &EncModule}}}, - {"ExceptionDB", {{PARAM_STRING, PARAM_RELOAD, &ExceptionDBName}}}, {"ExceptionExpiry", {{PARAM_TIME, PARAM_RELOAD, &ExceptionExpiry}}}, {"ExpireTimeout", {{PARAM_TIME, PARAM_RELOAD, &ExpireTimeout}}}, {"ForceForbidReason", {{PARAM_SET, PARAM_RELOAD, &ForceForbidReason}}}, @@ -1691,9 +1691,6 @@ int read_config(int reload) } CHEK2(MOTDFilename, MOTDFile); - if (!reload) { - CHEK2(ExceptionDBName, ExceptionDB); - } CHECK(UpdateTimeout); CHECK(ExpireTimeout); CHECK(ReadTimeout); |