From: Phil Sutter <phil@nwl.cc>
Date: Mon, 27 Sep 2021 14:59:49 +0000 (+0200)
Subject: nft-shared: Make nft_check_xt_legacy() family agnostic
X-Git-Tag: v1.8.8~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cf3976ef7f06b3892a111a3c187c6ca37dbc19e;p=thirdparty%2Fiptables.git

nft-shared: Make nft_check_xt_legacy() family agnostic

Of course there is no such thing as *_tables_names for ebtables, so no
legacy tables checking for ebtables-nft.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---

diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c
index 4253b081..72727270 100644
--- a/iptables/nft-shared.c
+++ b/iptables/nft-shared.c
@@ -992,6 +992,7 @@ void nft_check_xt_legacy(int family, bool is_ipt_save)
 {
 	static const char tables6[] = "/proc/net/ip6_tables_names";
 	static const char tables4[] = "/proc/net/ip_tables_names";
+	static const char tablesa[] = "/proc/net/arp_tables_names";
 	const char *prefix = "ip";
 	FILE *fp = NULL;
 	char buf[1024];
@@ -1004,6 +1005,10 @@ void nft_check_xt_legacy(int family, bool is_ipt_save)
 		fp = fopen(tables6, "r");
 		prefix = "ip6";
 		break;
+	case NFPROTO_ARP:
+		fp = fopen(tablesa, "r");
+		prefix = "arp";
+		break;
 	default:
 		break;
 	}