diff options
Diffstat (limited to 'runtime/rsconf.c')
| -rw-r--r-- | runtime/rsconf.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index aa7a3e3b..fd42caf9 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -361,6 +361,7 @@ void cnfDoObj(struct cnfobj *o) glblProcessCnf(o); break; } + nvlstChkUnused(o->nvlst); cnfobjDestruct(o); } @@ -542,6 +543,16 @@ dropPrivileges(rsconf_t *cnf) } +/* tell the rsysog core (including ourselfs) that the config load is done and + * we need to prepare to move over to activate mode. + */ +static inline void +tellCoreConfigLoadDone(void) +{ + glblDoneLoadCnf(); +} + + /* Tell input modules that the config parsing stage is over. */ static rsRetVal tellModulesConfigLoadDone(void) @@ -755,9 +766,7 @@ activate(rsconf_t *cnf) if(ourConf->globals.pszConfDAGFile != NULL) generateConfigDAG(ourConf->globals.pszConfDAGFile); # endif - tellModulesConfigLoadDone(); setUmask(cnf->globals.umask); - tellModulesCheckConfig(); /* the output part and the queue is now ready to run. So it is a good time * to initialize the inputs. Please note that the net code above should be @@ -911,7 +920,7 @@ finalize_it: } -/* legac config system: reset config variables to default values. */ +/* legacy config system: reset config variables to default values. */ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal) { loadConf->globals.bLogStatusMsgs = DFLT_bLogStatusMsgs; @@ -1251,6 +1260,10 @@ ourConf = loadConf; // TODO: remove, once ourConf is gone! ABORT_FINALIZE(RS_RET_NO_ACTIONS); } + tellCoreConfigLoadDone(); + tellModulesConfigLoadDone(); + + tellModulesCheckConfig(); CHKiRet(validateConf()); /* we are done checking the config - now validate if we should actually run or not. |