ebtables-compat: don't make failing extension load fatal
We will fail later when we can't parse the option, but that
failure only happens if the is actually used.
So in some cases things will work fine even if an extension
doesn't exist.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c
index c8b5d4f..33f7851 100644
--- a/iptables/xtables-eb.c
+++ b/iptables/xtables-eb.c
@@ -605,9 +605,11 @@
struct xtables_match *m;
size_t size;
- m = xtables_find_match(name, XTF_LOAD_MUST_SUCCEED, NULL);
- if (m == NULL)
- xtables_error(OTHER_PROBLEM, "Unable to load %s match", name);
+ m = xtables_find_match(name, XTF_TRY_LOAD, NULL);
+ if (m == NULL) {
+ fprintf(stderr, "Unable to load %s match\n", name);
+ return;
+ }
size = XT_ALIGN(sizeof(struct xt_entry_match)) + m->size;
m->m = xtables_calloc(1, size);
@@ -626,10 +628,11 @@
struct xtables_target *watcher;
size_t size;
- watcher = xtables_find_target(name, XTF_LOAD_MUST_SUCCEED);
- if (!watcher)
- xtables_error(OTHER_PROBLEM,
- "Unable to load %s watcher", name);
+ watcher = xtables_find_target(name, XTF_TRY_LOAD);
+ if (!watcher) {
+ fprintf(stderr, "Unable to load %s watcher\n", name);
+ return;
+ }
size = XT_ALIGN(sizeof(struct xt_entry_target)) + watcher->size;