]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
xtables: Fix program name in xtables_error()
authorPhil Sutter <phil@nwl.cc>
Thu, 2 Aug 2018 15:05:14 +0000 (17:05 +0200)
committerFlorian Westphal <fw@strlen.de>
Sat, 4 Aug 2018 12:16:17 +0000 (14:16 +0200)
The error function is shared among different programs, so it should take
information from xt_params pointer instead of xtables_globals object.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
iptables/xtables.c

index 2a4e0ec69e60b5a1ec3973bad08e362706103ed0..ca6119b30336d70406da1e4a4c13711f47b9fa8c 100644 (file)
@@ -156,9 +156,9 @@ static const int inverse_for_options[NUMBER_OF_OPT] =
 /* -f */ IPT_INV_FRAG,
 };
 
-#define opts xtables_globals.opts
-#define prog_name xtables_globals.program_name
-#define prog_vers xtables_globals.program_version
+#define opts xt_params->opts
+#define prog_name xt_params->program_name
+#define prog_vers xt_params->program_version
 
 static void __attribute__((noreturn))
 exit_tryhelp(int status)