From: Phil Sutter <phil@nwl.cc>
Date: Thu, 2 Aug 2018 15:05:14 +0000 (+0200)
Subject: xtables: Fix program name in xtables_error()
X-Git-Tag: v1.8.1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ad525cf2ad35928c12e7ec6710fb556f6d1ef7;p=thirdparty%2Fiptables.git

xtables: Fix program name in xtables_error()

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>
---

diff --git a/iptables/xtables.c b/iptables/xtables.c
index 2a4e0ec6..ca6119b3 100644
--- a/iptables/xtables.c
+++ b/iptables/xtables.c
@@ -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)