denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make starter behave more gracefully in the presence of non-fatal errors

Browse Source
This commit is contained in:
Andreas Steffen
2007-06-25 07:10:23 +00:00
parent 17d92e9732
commit 3345c0a1ed
3 changed files with 199 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/starter.c
+6 -4
View File
@@ -237,9 +237,10 @@ int main (int argc, char **argv)
}
cfg = confread_load(CONFIG_FILE);
if (!cfg)
if (cfg->err > 0)
{
plog("unable to start strongSwan -- errors in config");
plog("unable to start strongSwan -- fatal errors in config");
confread_free(cfg);
exit(1);
}
@@ -373,7 +374,7 @@ int main (int argc, char **argv)
);
new_cfg = confread_load(CONFIG_FILE);
if (new_cfg)
if (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
@@ -466,7 +467,8 @@ int main (int argc, char **argv)
}
else
{
plog("can't reload config file: %s -- keeping old one");
plog("can't reload config file due to errors -- keeping old one");
confread_free(new_cfg);
}
_action_ &= ~FLAG_ACTION_UPDATE;
last_reload = time(NULL);