From 8681a87405dd628aacc4bcca83bc120e328551ad Mon Sep 17 00:00:00 2001 From: "Naram Qashat cyberbotx@cyberbotx.com" Date: Sun, 9 Nov 2008 23:10:22 +0000 Subject: Added networkname directive to networkinfo block in new config. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1619 5417fbe8-f217-4b02-8779-1006273d7864 --- data/example_new.conf | 5 +++++ src/config.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/example_new.conf b/data/example_new.conf index 9121223b4..e254bcabf 100644 --- a/data/example_new.conf +++ b/data/example_new.conf @@ -196,6 +196,11 @@ networkinfo { * This directive is optional. */ #logbot = yes + + /* + * This is the name of the network that Services will be running on. + */ + networkname = "LocalNet" } /* diff --git a/src/config.c b/src/config.c index d491dbef5..b3762c45f 100644 --- a/src/config.c +++ b/src/config.c @@ -607,6 +607,7 @@ int ServerConfig::Read(bool bail) {"networkinfo", "helpchannel", "", new ValueContainerChar(&HelpChannel), DT_CHARPTR, NoValidation}, {"networkinfo", "logchannel", "", new ValueContainerChar(&LogChannel), DT_CHARPTR, NoValidation}, {"networkinfo", "logbot", "no", new ValueContainerBool(&LogBot), DT_BOOLEAN, NoValidation}, + {"networkinfo", "networkname", "", new ValueContainerChar(&NetworkName), DT_CHARPTR, ValidateNotEmpty}, {"nickserv", "nick", "NickServ", new ValueContainerChar(&s_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"nickserv", "description", "Nickname Registration Service", new ValueContainerChar(&desc_NickServ), DT_CHARPTR | DT_NORELOAD, ValidateNotEmpty}, {"nickserv", "database", "nick.db", new ValueContainerChar(&NickDBName), DT_CHARPTR, ValidateNotEmpty}, @@ -1321,7 +1322,6 @@ Directive directives[] = { {"MysqlRetries", {{PARAM_POSINT, PARAM_RELOAD, &MysqlRetries}}}, {"MysqlRetryGap", {{PARAM_POSINT, PARAM_RELOAD, &MysqlRetryGap}}}, {"ModuleAutoload", {{PARAM_STRING, PARAM_RELOAD, &Modules}}}, - {"NetworkName", {{PARAM_STRING, PARAM_RELOAD, &NetworkName}}}, {"NewsCount", {{PARAM_POSINT, PARAM_RELOAD, &NewsCount}}}, {"NickLen", {{PARAM_POSINT, 0, &NickLen}}}, {"NickRegDelay", {{PARAM_POSINT, PARAM_RELOAD, &NickRegDelay}}}, @@ -1674,8 +1674,6 @@ int read_config(int reload) CHECK(EncModule); - CHECK(NetworkName); - CHECK(UpdateTimeout); CHECK(ExpireTimeout); CHECK(ReadTimeout); -- cgit