diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-05-31 14:54:33 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-12-30 23:50:31 +0100 |
commit | 55bca4aa60c0027a39e635b2f05274058a2dcf2f (patch) | |
tree | d4162515358023fb5b2516262fa92dfb670b0050 | |
parent | 035cf69ebfb74647fc6110e7c8cb2860e4a37162 (diff) |
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 <pablo@netfilter.org>
-rw-r--r-- | iptables/nft.c | 2 | ||||
-rw-r--r-- | 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; } |