nft-compat: fix wrong protocol context in initialization
Pablo Neira Ayuso
maintainerPATCH 1/1 nft-compat: fix wrong protocol context in initialization
This fixes matches/targets that are dependent on that IPv4/Ipv6 context, eg.
# ip6tables-compat -I INPUT -j REJECT --reject-with icmp6-addr-unreachable # ip6tables-compat-save ... -A INPUT -j REJECT --reject-with icmp6-port-unreachable
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- iptables/xtables-save.c | 3 +-- iptables/xtables.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-)
iptables/xtables-save.c +1 -2
@@ -85,8 +85,7 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[])int c; xtables_globals.program_name = progname; -/* XXX xtables_init_all does several things we don't want */ - c =xtables_init_all (&xtables_globals,NFPROTO_IPV4 ); + c =xtables_init_all (&xtables_globals, family);if (c <0 ) { fprintf(stderr, "%s/%s Failed to initialize xtables\n", xtables_globals.program_name,
iptables/xtables.c +2 -3
@@ -691,7 +691,7 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table,struct xtables_rule_match *matchp;struct xtables_target *t;struct xtables_args args = { - .family =AF_INET , + .family = h->family, };memset (&cs,0 ,sizeof (cs));
@@ -716,8 +716,7 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table,demand-load a protocol. */ opterr =0 ; -/* Default on AF_INET */ - h->ops =nft_family_ops_lookup (AF_INET ); + h->ops =nft_family_ops_lookup (h->family);if (h->ops ==NULL )xtables_error (PARAMETER_PROBLEM ,"Unknown family" );
Signature · 1 line
1.7.10.4