From: Holger Eitzenberger <holger@eitzenberger.org>
Date: Tue, 18 Jan 2011 16:30:50 +0000 (+0100)
Subject: Do session initialization once
X-Git-Tag: v5.3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ba43e68db3e61e0e8c13d5189f153a06954259d;p=thirdparty%2Fipset.git

Do session initialization once

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
---

diff --git a/src/ipset.c b/src/ipset.c
index d4cf7b86..8ed3e101 100644
--- a/src/ipset.c
+++ b/src/ipset.c
@@ -431,14 +431,6 @@ parse_commandline(int argc, char *argv[])
 	const struct ipset_commands *command;
 	const struct ipset_type *type;
 
-	/* Initialize session */
-	if (session == NULL) {
-		session = ipset_session_init(printf);
-		if (session == NULL)
-			return exit_error(OTHER_PROBLEM,
-				"Cannot initialize ipset session, aborting.");
-	}
-
 	/* Set session lineno to report parser errors correctly */
 	ipset_session_lineno(session, restore_line);
 
@@ -746,5 +738,11 @@ main(int argc, char *argv[])
 	ipset_type_add(&ipset_hash_ipportnet0);
 	ipset_type_add(&ipset_list_set0);
 
+	/* Initialize session */
+	session = ipset_session_init(printf);
+	if (session == NULL)
+		return exit_error(OTHER_PROBLEM,
+			"Cannot initialize ipset session, aborting.");
+
 	return parse_commandline(argc, argv);
 }