pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-30 12:46:37 +02:00
Code Activity

The 'class' block is now always read before 'allow'. No specific order required anymore.

Browse Source
This commit is contained in:
Bram Matthys
2016-12-29 10:38:10 +01:00
parent aae0971cf4
commit cbcbdc656a
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/s_conf.c
+18 -3
View File
@@ -2272,15 +2272,30 @@ int config_run()
}
}
/* Stage 2: now all the rest */
/* Stage 2: now class blocks */
for (cfptr = conf; cfptr; cfptr = cfptr->cf_next)
{
if (config_verbose > 1)
config_status("Running %s", cfptr->cf_filename);
for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
{
if (!strcmp(ce->ce_varname, "set"))
continue; // skip set block, already done
if (!strcmp(ce->ce_varname, "class"))
{
if (_conf_class(cfptr, ce) < 0)
errors++;
}
}
}
/* Stage 3: now all the rest */
for (cfptr = conf; cfptr; cfptr = cfptr->cf_next)
{
if (config_verbose > 1)
config_status("Running %s", cfptr->cf_filename);
for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
{
if (!strcmp(ce->ce_varname, "set") || !strcmp(ce->ce_varname, "class"))
continue; // already processed
if ((cc = config_binary_search(ce->ce_varname))) {
if ((cc->conffunc) && (cc->conffunc(cfptr, ce) < 0))