|
@@ -0,0 +1,58 @@
|
|
|
+From 6cb8af1ff3951e47def7a16db39289dc9d9c61fe Mon Sep 17 00:00:00 2001
|
|
|
+From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
|
|
|
+Date: Tue, 23 Jun 2020 16:09:02 -0700
|
|
|
+Subject: libxtables: compiler warning fixes for NO_SHARED_LIBS
|
|
|
+MIME-Version: 1.0
|
|
|
+Content-Type: text/plain; charset=UTF-8
|
|
|
+Content-Transfer-Encoding: 8bit
|
|
|
+
|
|
|
+Fixes two issues with NO_SHARED_LIBS:
|
|
|
+ - #include <dlfcn.h> is ifdef'ed out and thus dlclose()
|
|
|
+ triggers an undeclared function compiler warning
|
|
|
+ - dlreg_add() is unused and thus triggers an unused
|
|
|
+ function warning
|
|
|
+
|
|
|
+Test: builds without warnings
|
|
|
+Signed-off-by: Maciej Żenczykowski <maze@google.com>
|
|
|
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
+
|
|
|
+[Retrieved from:
|
|
|
+https://git.netfilter.org/iptables/commit/libxtables/xtables.c?id=6cb8af1ff3951e47def7a16db39289dc9d9c61fe]
|
|
|
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+---
|
|
|
+ libxtables/xtables.c | 4 ++++
|
|
|
+ 1 file changed, 4 insertions(+)
|
|
|
+
|
|
|
+diff --git a/libxtables/xtables.c b/libxtables/xtables.c
|
|
|
+index 7fe42580..8907ba20 100644
|
|
|
+--- a/libxtables/xtables.c
|
|
|
++++ b/libxtables/xtables.c
|
|
|
+@@ -206,6 +206,7 @@ struct xtables_target *xtables_targets;
|
|
|
+ static bool xtables_fully_register_pending_match(struct xtables_match *me);
|
|
|
+ static bool xtables_fully_register_pending_target(struct xtables_target *me);
|
|
|
+
|
|
|
++#ifndef NO_SHARED_LIBS
|
|
|
+ /* registry for loaded shared objects to close later */
|
|
|
+ struct dlreg {
|
|
|
+ struct dlreg *next;
|
|
|
+@@ -237,6 +238,7 @@ static void dlreg_free(void)
|
|
|
+ dlreg = next;
|
|
|
+ }
|
|
|
+ }
|
|
|
++#endif
|
|
|
+
|
|
|
+ void xtables_init(void)
|
|
|
+ {
|
|
|
+@@ -267,7 +269,9 @@ void xtables_init(void)
|
|
|
+
|
|
|
+ void xtables_fini(void)
|
|
|
+ {
|
|
|
++#ifndef NO_SHARED_LIBS
|
|
|
+ dlreg_free();
|
|
|
++#endif
|
|
|
+ }
|
|
|
+
|
|
|
+ void xtables_set_nfproto(uint8_t nfproto)
|
|
|
+--
|
|
|
+cgit v1.2.3
|
|
|
+
|