xtables: Call init_extensions6() for static builds

Initialize extensions from libext6 for cases where xtables is built statically.

Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1550
Signed-off-by: Erik Wilson <Erik.E.Wilson@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c
index 4b9809805fb5b8385381d211d0b2498c56cf3a0b..21d4bec08fd9acea306805752140270d500c3e80 100644 (file)
--- a/iptables/xtables-monitor.c
+++ b/iptables/xtables-monitor.c
@@ -628,6 +628,7 @@ int xtables_monitor_main(int argc, char *argv[])
 #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
        init_extensions();
        init_extensions4();
+       init_extensions6();
 #endif
 
        if (nft_init(&h, AF_INET, xtables_ipv4)) {

diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index d27394972d90cd0ef35276800654d713115efd8f..72832103d6bc3e8e1b49ba385a5b26b1381a02f6 100644 (file)
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -364,6 +364,7 @@ xtables_restore_main(int family, const char *progname, int argc, char *argv[])
 #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
                init_extensions();
                init_extensions4();
+               init_extensions6();
 #endif
                break;
        case NFPROTO_ARP:

diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c
index cfce0472f3ee813769891b32e1b4af9b07ea2c25..98cd0ed3f4716d568c17969ba2b4b7b7a5855dd5 100644 (file)
--- a/iptables/xtables-save.c
+++ b/iptables/xtables-save.c
@@ -203,6 +203,7 @@ xtables_save_main(int family, int argc, char *argv[],
 #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
                init_extensions();
                init_extensions4();
+               init_extensions6();
 #endif
                tables = xtables_ipv4;
                d.commit = true;

diff --git a/iptables/xtables-standalone.c b/iptables/xtables-standalone.c
index 7b71db62f1ea6b3df9a5544f87e1e253d700e187..1a6b7cf73a4bb2b3f5de999e52cc4a085a3e47f1 100644 (file)
--- a/iptables/xtables-standalone.c
+++ b/iptables/xtables-standalone.c
@@ -57,6 +57,7 @@ xtables_main(int family, const char *progname, int argc, char *argv[])
 #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
        init_extensions();
        init_extensions4();
+       init_extensions6();
 #endif
 
        if (nft_init(&h, family, xtables_ipv4) < 0) {

diff --git a/iptables/xtables-translate.c b/iptables/xtables-translate.c
index 33ba68eceb74869010eeec0986858b6e59004a04..49f44b6ffa5a36db45b472d845c17ee2268f109b 100644 (file)
--- a/iptables/xtables-translate.c
+++ b/iptables/xtables-translate.c
@@ -482,6 +482,7 @@ static int xtables_xlate_main_common(struct nft_handle *h,
 #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
        init_extensions();
        init_extensions4();
+       init_extensions6();
 #endif
                tables = xtables_ipv4;
                break;