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