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 <art...@debian.org>
---
src/main.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main.c b/src/main.c
index fb20f1d..4b6d17d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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
*/
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
