summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2013-08-08 18:16:36 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-08-08 18:16:36 +0200
commitc355b3e730f0bee51349e94f6a91e0ea36342833 (patch)
tree6d9a266a8d3a428e74013b72c18eada14840d06f
parentdb503b5ac1e4970ac5aaf190d8d0e6272ae54038 (diff)
parentb28d4dcc9f5559e9c03f35458ac103cfb89d8f87 (diff)
Merge branch 'stable-1.4.20'
To retrieve: iptables: state match incompatibilty across versions
-rw-r--r--extensions/libxt_conntrack.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index 9f7b5db2..128bbd20 100644
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
@@ -1272,6 +1272,8 @@ static struct xtables_match conntrack_mt_reg[] = {
.size = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo1)),
.userspacesize = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo1)),
.help = state_help,
+ .print = state_print,
+ .save = state_save,
.x6_parse = state_ct1_parse,
.x6_options = state_opts,
},
@@ -1285,6 +1287,8 @@ static struct xtables_match conntrack_mt_reg[] = {
.size = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo2)),
.userspacesize = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo2)),
.help = state_help,
+ .print = state_print,
+ .save = state_save,
.x6_parse = state_ct23_parse,
.x6_options = state_opts,
},
@@ -1298,6 +1302,8 @@ static struct xtables_match conntrack_mt_reg[] = {
.size = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo3)),
.userspacesize = XT_ALIGN(sizeof(struct xt_conntrack_mtinfo3)),
.help = state_help,
+ .print = state_print,
+ .save = state_save,
.x6_parse = state_ct23_parse,
.x6_options = state_opts,
},