/* load IPSec configuration file */
cfgp = parser_load_conf(file);
if (!cfgp)
+ {
return NULL;
-
+ }
cfg = (starter_config_t *)alloc_thing(starter_config_t, "starter_config_t");
/* set default values */
);
new_cfg = confread_load(CONFIG_FILE);
- if (new_cfg->err + new_cfg->non_fatal_err == 0)
+ if (new_cfg && (new_cfg->err + new_cfg->non_fatal_err == 0))
{
/* Switch to new config. New conn will be loaded below */
if (!starter_cmp_defaultroute(&new_cfg->defaultroute
else
{
plog("can't reload config file due to errors -- keeping old one");
- confread_free(new_cfg);
+ if (new_cfg)
+ {
+ confread_free(new_cfg);
+ }
}
_action_ &= ~FLAG_ACTION_UPDATE;
last_reload = time(NULL);