From 638794172f726363bf598a1c9960346b9c28a751 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 7 Nov 2018 10:32:42 +0100 Subject: arptables: fix --version info old: arptables vlibxtables.so.12 (nf_tables) now: arptables 1.8.1 (nf_tables) Signed-off-by: Florian Westphal --- iptables/xtables-arp.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'iptables/xtables-arp.c') diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index d0cd6887..819e7e6c 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -208,9 +208,6 @@ static int inverse_for_options[NUMBER_OF_OPT] = /* -c */ 0, }; -const char *program_version = XTABLES_VERSION; -const char *program_name = "arptables"; - /* A few hardcoded protocols for 'all' and in case the user has no /etc/protocols */ struct pprot { @@ -406,7 +403,8 @@ static void exit_tryhelp(int status) { fprintf(stderr, "Try `%s -h' or '%s --help' for more information.\n", - program_name, program_name ); + arptables_globals.program_name, + arptables_globals.program_version); exit(status); } @@ -425,10 +423,16 @@ exit_printhelp(void) " %s -E old-chain-name new-chain-name\n" " %s -P chain target [options]\n" " %s -h (print this help information)\n\n", - program_name, program_version, program_name, program_name, - program_name, program_name, program_name, program_name, - program_name, program_name); - + arptables_globals.program_name, + arptables_globals.program_version, + arptables_globals.program_name, + arptables_globals.program_name, + arptables_globals.program_name, + arptables_globals.program_name, + arptables_globals.program_name, + arptables_globals.program_name, + arptables_globals.program_name, + arptables_globals.program_name); printf( "Commands:\n" "Either long or short options are allowed.\n" @@ -1199,10 +1203,11 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, case 'V': if (invert) - printf("Not %s ;-)\n", program_version); + printf("Not %s ;-)\n", arptables_globals.program_version); else printf("%s v%s (nf_tables)\n", - program_name, program_version); + arptables_globals.program_name, + arptables_globals.program_version); exit(0); case '0': -- cgit v1.2.3