32 lines
1,011 B
Diff
32 lines
1,011 B
Diff
|
diff --git a/tc/m_xt.c b/tc/m_xt.c
|
||
|
|
index ede9913..268938b 100644
|
||
|
|
--- a/tc/m_xt.c
|
||
|
|
+++ b/tc/m_xt.c
|
||
|
|
@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
tcipt_globals.opts =
|
||
|
|
- xtables_merge_options(tcipt_globals.opts,
|
||
|
|
+ xtables_merge_options(
|
||
|
|
+#if XTABLES_VERSION_CODE > 5
|
||
|
|
+ tcipt_globals.orig_opts,
|
||
|
|
+#endif
|
||
|
|
+ tcipt_globals.opts,
|
||
|
|
m->extra_opts,
|
||
|
|
&m->option_offset);
|
||
|
|
} else {
|
||
|
|
@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
|
||
|
|
}
|
||
|
|
|
||
|
|
tcipt_globals.opts =
|
||
|
|
- xtables_merge_options(tcipt_globals.opts,
|
||
|
|
+ xtables_merge_options(
|
||
|
|
+#if XTABLES_VERSION_CODE > 5
|
||
|
|
+ tcipt_globals.orig_opts,
|
||
|
|
+#endif
|
||
|
|
+ tcipt_globals.opts,
|
||
|
|
m->extra_opts,
|
||
|
|
&m->option_offset);
|
||
|
|
} else {
|
||
|
|
|