diff options
author | Arturo Borrero Gonzalez <arturo@debian.org> | 2017-06-06 12:58:27 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-06-06 18:10:40 +0200 |
commit | 9d3844510d8b7b40199027286a16b9c3e06352fa (patch) | |
tree | 171bce1c4a1866f1df90b57399a6656ea6633c1e | |
parent | ef410bf00a5b1e36dada75127dd525cd377a4756 (diff) |
conntrackd: evaluate configuration earlier
Run the evaluation step sooner in the conntrackd startup routine.
Don't close log or unlink lockfile at this stage.
Signed-off-by: Arturo Borrero Gonzalez <arturo@debian.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | src/main.c | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -338,6 +338,15 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + /* + * Evaluate configuration + */ + if (evaluate() == -1) { + dlog(LOG_ERR, "conntrackd cannot start, please review your " + "configuration"); + exit(EXIT_FAILURE); + } + if (type == REQUEST) { if (do_local_request(action, &conf.local, local_step) == -1) { dlog(LOG_ERR, "can't connect: is conntrackd " @@ -383,17 +392,6 @@ int main(int argc, char *argv[]) } /* - * Evaluate configuration - */ - if (evaluate() == -1) { - dlog(LOG_ERR, "conntrackd cannot start, please review your " - "configuration"); - close_log(); - unlink(CONFIG(lockfile)); - exit(EXIT_FAILURE); - } - - /* * initialization process */ |