etc: Drop xtables.conf
Phil Sutter
reviewerPATCH 1/1 etc: Drop xtables.conf
The file is not used since the commit this one fixes. Also it wasn't installed until recently, when commit 3822a992bc277 ("Makefile: Fix for 'make distcheck'") added it in the wrong spot in an attempt to reduce differences between tarballs generated by 'make tarball' and 'make dist'.
While being at it, drop stale xtables_config_main() prototype from xtables-multi.h.
--- Makefile.am | 2 +- etc/xtables.conf | 74 ---------------------------------------- iptables/xtables-multi.h | 1 - 3 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 etc/xtables.conf
Makefile.am +1 -1
@@ -20,7 +20,7 @@ EXTRA_DIST = autogen.sh iptables-test.py xlate-test.py if ENABLE_NFTABLES confdir = $(sysconfdir) -dist_conf_DATA = etc/ethertypes etc/xtables.conf +dist_conf_DATA = etc/ethertypes endif .PHONY: tarball
etc/xtables.conf deleted +0 -74
74 lines not on this page · raw message
iptables/xtables-multi.h +0 -1
@@ -20,7 +20,6 @@ extern int xtables_arp_save_main(int, char **);extern int xtables_eb_main (int ,char **);extern int xtables_eb_restore_main (int ,char **);extern int xtables_eb_save_main (int ,char **); -extern int xtables_config_main (int ,char **);extern int xtables_monitor_main (int ,char **);extern struct xtables_globals arptables_globals;
Signature · 1 line
2.38.0
Phil Sutter
reviewerQuoted 11 lines · Phil Sutter
The file is not used since the commit this one fixes. Also it wasn't installed until recently, when commit
3822a992bc277("Makefile: Fix for 'make distcheck'") added it in the wrong spot in an attempt to reduce differences between tarballs generated by 'make tarball' and 'make dist'.While being at it, drop stale
xtables_config_main()prototype fromxtables-multi.h.Fixes 06fd5e46d46f7 ("xtables: Drop support for /etc/xtables.conf")Signed-off-by Phil Sutter <[email protected]>
Patch applied.