diff options
| author | Adam <Adam@anope.org> | 2011-04-28 22:44:34 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-05-16 04:09:32 -0400 |
| commit | 583954d3a1db658281a9afb7b7dd6773726c8c11 (patch) | |
| tree | 6a00865d5738c6d0bc42efb35f3f468c5876eb3e /src/config.cpp | |
| parent | 8fb1604f649bec6f356770daf5df6bb8ab811bbf (diff) | |
Use module type to determine what type each module is instead of its location in the configuration file.
Diffstat (limited to 'src/config.cpp')
| -rw-r--r-- | src/config.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/config.cpp b/src/config.cpp index 0ce28d34e..288e33685 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -18,8 +18,6 @@ ConfigurationFile services_conf("services.conf", false); // Services configurati ServerConfig *Config = NULL; static Anope::string Modules; -static Anope::string EncModules; -static Anope::string DBModules; static Anope::string UlineServers; static Anope::string OSNotifications; static Anope::string BSDefaults; @@ -200,8 +198,6 @@ ServerConfig::ServerConfig() : config_data(), NSDefFlags(NickCoreFlagStrings), C /* Modules Autoload building... :P */ this->ModulesAutoLoad = BuildStringList(Modules); - this->EncModuleList = BuildStringList(EncModules); - this->DBModuleList = BuildStringList(DBModules); if (this->LimitSessions) { @@ -1003,7 +999,6 @@ ConfigItems::ConfigItems(ServerConfig *conf) {"serverinfo", "name", "", new ValueContainerString(&conf->ServerName), DT_HOSTNAME | DT_NORELOAD, ValidateNotEmpty}, {"serverinfo", "description", "", new ValueContainerString(&conf->ServerDesc), DT_STRING | DT_NORELOAD, ValidateNotEmpty}, {"serverinfo", "localhost", "", new ValueContainerString(&conf->LocalHost), DT_HOSTNAME | DT_NORELOAD, NoValidation}, - {"serverinfo", "type", "", new ValueContainerString(&conf->IRCDModule), DT_STRING | DT_NORELOAD, ValidateNotEmpty}, {"serverinfo", "id", "", new ValueContainerString(&conf->Numeric), DT_NOSPACES | DT_NORELOAD, NoValidation}, {"serverinfo", "ident", "", new ValueContainerString(&conf->ServiceUser), DT_STRING | DT_NORELOAD, ValidateNotEmpty}, {"serverinfo", "hostname", "", new ValueContainerString(&conf->ServiceHost), DT_STRING | DT_NORELOAD, ValidateNotEmpty}, @@ -1013,10 +1008,7 @@ ConfigItems::ConfigItems(ServerConfig *conf) {"networkinfo", "nicklen", "31", new ValueContainerUInt(&conf->NickLen), DT_UINTEGER | DT_NORELOAD, ValidateNickLen}, {"networkinfo", "userlen", "10", new ValueContainerUInt(&conf->UserLen), DT_UINTEGER | DT_NORELOAD, NoValidation}, {"networkinfo", "hostlen", "64", new ValueContainerUInt(&conf->HostLen), DT_UINTEGER | DT_NORELOAD, NoValidation}, - {"options", "encryption", "", new ValueContainerString(&EncModules), DT_STRING | DT_NORELOAD, ValidateNotEmpty}, {"options", "passlen", "32", new ValueContainerUInt(&conf->PassLen), DT_UINTEGER | DT_NORELOAD, NoValidation}, - {"options", "database", "", new ValueContainerString(&DBModules), DT_STRING | DT_NORELOAD, ValidateNotEmpty}, - {"options", "socketengine", "", new ValueContainerString(&conf->SocketEngine), DT_STRING | DT_NORELOAD, ValidateNotEmpty}, {"options", "userkey1", "0", new ValueContainerLUInt(&conf->UserKey1), DT_LUINTEGER, NoValidation}, {"options", "userkey2", "0", new ValueContainerLUInt(&conf->UserKey2), DT_LUINTEGER, NoValidation}, {"options", "userkey3", "0", new ValueContainerLUInt(&conf->UserKey3), DT_LUINTEGER, NoValidation}, |