---
tools/iptables-test.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/tools/iptables-test.c b/tools/iptables-test.c
index 77c989d..1fb5b14 100644
--- a/tools/iptables-test.c
+++ b/tools/iptables-test.c
@@ -1292,8 +1292,18 @@ static struct xtables_target *prepare_target(struct
connman_iptables *table,
if (xt_t == NULL)
return NULL;
- connman_iptables_globals.opts =
- xtables_merge_options(
+ if (xt_t->x6_options != NULL)
+ connman_iptables_globals.opts =
+ xtables_options_xfrm(
+#if XTABLES_VERSION_CODE > 5
+ connman_iptables_globals.orig_opts,
+#endif
+ connman_iptables_globals.opts,
+ xt_t->x6_options,
+ &xt_t->option_offset);
+ else
+ connman_iptables_globals.opts =
+ xtables_merge_options(
#if XTABLES_VERSION_CODE > 5
connman_iptables_globals.orig_opts,
#endif
--
1.7.7
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
