ebtables: Fix for wrong program name in error messages

Since nft_init_eb() is shared among standalone ebtables and
ebtables-restore, allow for callers to pass the program name.

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

diff --git a/iptables/nft.h b/iptables/nft.h
index a479cf072089deaaf37442b03f24061d94cc2243..6f58de251414f2347f75db9e9b30a0ba6cfd9b73 100644 (file)
--- a/iptables/nft.h
+++ b/iptables/nft.h
@@ -145,7 +145,7 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table, bool
 /* For xtables-arptables.c */
 int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table);
 /* For xtables-eb.c */
-int nft_init_eb(struct nft_handle *h);
+int nft_init_eb(struct nft_handle *h, const char *pname);
 int ebt_get_current_chain(const char *chain);
 int do_commandeb(struct nft_handle *h, int argc, char *argv[], char **table);
 

diff --git a/iptables/xtables-eb-standalone.c b/iptables/xtables-eb-standalone.c
index 2248b08d604985c632e22d679d21b327b036a943..069c9aa1d4c94d554198b9eda3d9432d9d6ab996 100644 (file)
--- a/iptables/xtables-eb-standalone.c
+++ b/iptables/xtables-eb-standalone.c
@@ -47,7 +47,7 @@ int xtables_eb_main(int argc, char *argv[])
        char *table = "filter";
        struct nft_handle h;
 
-       nft_init_eb(&h);
+       nft_init_eb(&h, "ebtables");
 
        ret = do_commandeb(&h, argc, argv, &table);
        if (ret)

diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c
index ab0539c8a54f3f02591603e107a206a0294716c8..a88655ce4e2452351233ff7d27b04952b5222bef 100644 (file)
--- a/iptables/xtables-eb.c
+++ b/iptables/xtables-eb.c
@@ -732,9 +732,9 @@ void ebt_add_watcher(struct xtables_target *watcher,
                cs->match_list->next = newnode;
 }
 
-int nft_init_eb(struct nft_handle *h)
+int nft_init_eb(struct nft_handle *h, const char *pname)
 {
-       ebtables_globals.program_name = "ebtables";
+       ebtables_globals.program_name = pname;
        if (xtables_init_all(&ebtables_globals, NFPROTO_BRIDGE) < 0) {
                fprintf(stderr, "%s/%s Failed to initialize ebtables-compat\n",
                        ebtables_globals.program_name,

diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index 60e07f78b38dfbf03e3be927d58f454708f88d19..4e46b625d02ee6599c0af3d5f10c6b4ec4686c12 100644 (file)
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -515,7 +515,7 @@ int xtables_eb_restore_main(int argc, char *argv[])
        const char *table = NULL;
        struct nft_handle h;
 
-       nft_init_eb(&h);
+       nft_init_eb(&h, "ebtables-restore");
 
        while ((c = getopt_long(argc, argv, "n",
                                ebt_restore_options, NULL)) != -1) {