diff options
-rw-r--r-- | data/example_new.conf | 11 | ||||
-rw-r--r-- | src/config.c | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/data/example_new.conf b/data/example_new.conf index f42645735..f264f6bb4 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -655,4 +655,15 @@ operserv * name) of the client. */ description = "Operator Service" + + /* + * The nickname of the Global client. + */ + globalnick = "Global" + + /* + * The description of the Global client, which will be used as the GECOS (real + * name) of the client. + */ + globaldescription = "Global Noticer" } diff --git a/src/config.c b/src/config.c index cfcf0b38b..8f4e0b955 100644 --- a/src/config.c +++ b/src/config.c @@ -638,6 +638,8 @@ int ServerConfig::Read(bool bail) {"helpserv", "description", "Help Service", new ValueContainerChar(&desc_HelpServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"operserv", "nick", "OperServ", new ValueContainerChar(&s_OperServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"operserv", "description", "Operator Service", new ValueContainerChar(&desc_OperServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"operserv", "globalnick", "Global", new ValueContainerChar(&s_GlobalNoticer), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, + {"operserv", "globaldescription", "Global Noticer", new ValueContainerChar(&desc_GlobalNoticer), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation} }; /* These tags can occur multiple times, and therefore they have special code to read them @@ -1243,8 +1245,6 @@ Directive directives[] = { {"ExceptionExpiry", {{PARAM_TIME, PARAM_RELOAD, &ExceptionExpiry}}}, {"ExpireTimeout", {{PARAM_TIME, PARAM_RELOAD, &ExpireTimeout}}}, {"ForceForbidReason", {{PARAM_SET, PARAM_RELOAD, &ForceForbidReason}}}, - {"GlobalName", {{PARAM_STRING, 0, &s_GlobalNoticer}, - {PARAM_STRING, 0, &desc_GlobalNoticer}}}, {"HelpCoreModules", {{PARAM_STRING, PARAM_RELOAD, &HelpCoreModules}}}, {"HelpChannel", {{PARAM_STRING, PARAM_RELOAD, &HelpChannel}}}, {"HostCoreModules", {{PARAM_STRING, PARAM_RELOAD, &HostCoreModules}}}, @@ -1687,7 +1687,6 @@ int read_config(int reload) CHECK(NetworkName); if (!reload) { CHEK2(temp_userhost, ServiceUser); - CHEK2(s_GlobalNoticer, GlobalName); CHEK2(PIDFilename, PIDFile); } |