diff options
| author | Naram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-25 02:46:11 +0000 |
|---|---|---|
| committer | Naram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-25 02:46:11 +0000 |
| commit | 66df9d4e7cef5d37b7886bf0c014cc517960e890 (patch) | |
| tree | 56d5b8cbb08163e69767b092f72701f96facc3a6 /src | |
| parent | 8eba4873bbe090795edd33e9a831348e02a47810 (diff) | |
Added servicesroot directive to operserv block in new config.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1472 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/config.c b/src/config.c index c8a640d50..7f2f5256a 100644 --- a/src/config.c +++ b/src/config.c @@ -177,7 +177,7 @@ int AnonymousGlobal; int RestrictOperNicks; char *GlobalOnCycleMessage; char *GlobalOnCycleUP; -char *ServicesRoot; +static char *ServicesRoot; char **ServicesRoots; int RootNumber; int SuperAdmin; @@ -644,6 +644,7 @@ int ServerConfig::Read(bool bail) {"operserv", "newsdatabase", "news.db", new ValueContainerChar(&NewsDBName), DT_CHARPTR, ValidateNotEmpty}, {"operserv", "exceptiondatabase", "exception.db", new ValueContainerChar(&ExceptionDBName), DT_CHARPTR, ValidateNotEmpty}, {"operserv", "autokilldatabase", "akill.db", new ValueContainerChar(&AutokillDBName), DT_CHARPTR, ValidateNotEmpty}, + {"operserv", "servicesroot", "", new ValueContainerChar(&ServicesRoot), 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 @@ -1303,7 +1304,6 @@ Directive directives[] = { {"SendFrom", {{PARAM_STRING, PARAM_RELOAD, &SendFrom}}}, {"ServerDesc", {{PARAM_STRING, 0, &ServerDesc}}}, {"ServerName", {{PARAM_STRING, 0, &ServerName}}}, - {"ServicesRoot", {{PARAM_STRING, PARAM_RELOAD, &ServicesRoot}}}, {"ServiceUser", {{PARAM_STRING, 0, &temp_userhost}}}, {"SessionLimitDetailsLoc", {{PARAM_STRING, PARAM_RELOAD, &SessionLimitDetailsLoc}}}, @@ -1696,7 +1696,6 @@ int read_config(int reload) CHECK(ReadTimeout); CHECK(WarningTimeout); CHECK(TimeoutCheck); - CHECK(ServicesRoot); CHECK(AutokillExpiry); CHECK(ChankillExpiry); CHECK(SGLineExpiry); @@ -1753,16 +1752,6 @@ int read_config(int reload) if (!hadAutoop) NSDefFlags |= NI_AUTOOP; } - if (!ServicesRoot) { - error(0, - "You must define the 'ServicesRoot' configuration directive"); - error(0, - "in your services.conf file. This is a required setting that"); - error(0, - "defines the main Administrative nick(s) Anope will obey."); - retval = 0; - } - if (!NewsCount) { NewsCount = 3; } |