diff options
| author | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-03 23:30:41 +0000 |
|---|---|---|
| committer | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-03 23:30:41 +0000 |
| commit | fbce6e2ba4b70ff06e13de5ed3b9c948e5b02e32 (patch) | |
| tree | 98098711547340c0002f0d5d556786637afe1a22 /src | |
| parent | f85457d2a4389d3709ed88ee75d906ad544a1f3d (diff) | |
Merge commit 'cbx/anopeng-config' into anopeng-config
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1411 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/config.c b/src/config.c index b4b9c5f0e..6568b2d2c 100644 --- a/src/config.c +++ b/src/config.c @@ -17,6 +17,11 @@ /*************************************************************************/ +ServerConfig serverConfig; + +// This is temporary while directives are transitioned from the old config to the new one -- CyberBotX +static const char *SERVICES_CONF_NEW = "services_new.conf"; + /* Configurable variables: */ char *IRCDModule; @@ -492,6 +497,7 @@ int ServerConfig::Read(bool bail) static const char *Once[] = {NULL}; // These tags can occur ONCE or not at all InitialConfig Values[] = { + {"coremodules", "ircd", "", new ValueContainerChar(IRCDModule), 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 @@ -506,7 +512,7 @@ int ServerConfig::Read(bool bail) // Load and parse the config file, if there are any errors then explode // Make a copy here so if it fails then we can carry on running with an unaffected config newconfig.clear(); - if (LoadConf(newconfig, SERVICES_CONF, errstr)) { + if (LoadConf(newconfig, SERVICES_CONF_NEW, errstr)) { // If we succeeded, set the ircd config to the new one config_data = newconfig; } @@ -1612,6 +1618,8 @@ int read_config(int reload) } } + retval = serverConfig.Read(reload); + if (!retval) return 0; // Temporary until most of the below is modified to use the new parser -- CyberBotX config = fopen(SERVICES_CONF, "r"); if (!config) { #ifndef NOT_MAIN |