From 55bca4aa60c0027a39e635b2f05274058a2dcf2f Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 31 May 2013 14:54:33 +0200 Subject: nft: don't call nft_init in nft_xtables_config_load Otherwise we keep initializing the handle over and over again. Signed-off-by: Pablo Neira Ayuso --- iptables/nft.c | 2 -- iptables/xtables-config.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iptables/nft.c b/iptables/nft.c index 54951154..ca56d0ed 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -2798,8 +2798,6 @@ int nft_xtables_config_load(struct nft_handle *h, const char *filename, return -1; } - nft_init(h); - /* Stage 1) create tables */ titer = nft_table_list_iter_create(table_list); while ((table = nft_table_list_iter_next(titer)) != NULL) { diff --git a/iptables/xtables-config.c b/iptables/xtables-config.c index 3ad46e85..12165627 100644 --- a/iptables/xtables-config.c +++ b/iptables/xtables-config.c @@ -35,6 +35,8 @@ int xtables_config_main(int argc, char *argv[]) else filename = argv[1]; + nft_init(&h); + return nft_xtables_config_load(&h, filename, NFT_LOAD_VERBOSE) == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- cgit v1.2.3