|
 |
9a3fa7 |
From 2c7f817f6dc2d74d99248403b0ef7e36bcf060c8 Mon Sep 17 00:00:00 2001
|
|
|
9a3fa7 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
9a3fa7 |
Date: Wed, 3 Apr 2019 20:29:38 +0200
|
|
|
9a3fa7 |
Subject: [PATCH] extensions: libxt_devgroup: Fix the path of the group
|
|
|
9a3fa7 |
mappings file
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1657075
|
|
|
9a3fa7 |
Upstream Status: iptables commit 93ad9ea1b86bd
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
commit 93ad9ea1b86bdaacffd8e33654abcea3d4e148b2
|
|
|
9a3fa7 |
Author: Ana Rey <anarey@gmail.com>
|
|
|
9a3fa7 |
Date: Thu Sep 18 13:06:42 2014 +0200
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
extensions: libxt_devgroup: Fix the path of the group mappings file
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
Use "/etc/iproute2/group" as the default path to the mapping file
|
|
|
9a3fa7 |
instead of "/etc/iproute2/group_map".
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
Signed-off-by: Ana Rey <anarey@gmail.com>
|
|
|
9a3fa7 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
9a3fa7 |
---
|
|
|
9a3fa7 |
extensions/libxt_devgroup.c | 4 ++--
|
|
|
9a3fa7 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
diff --git a/extensions/libxt_devgroup.c b/extensions/libxt_devgroup.c
|
|
|
9a3fa7 |
index 4a69c8229ce4a..fb1fcb51c1bb2 100644
|
|
|
9a3fa7 |
--- a/extensions/libxt_devgroup.c
|
|
|
9a3fa7 |
+++ b/extensions/libxt_devgroup.c
|
|
|
9a3fa7 |
@@ -31,12 +31,12 @@ static const struct xt_option_entry devgroup_opts[] = {
|
|
|
9a3fa7 |
XTOPT_TABLEEND,
|
|
|
9a3fa7 |
};
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
-/* array of devgroups from /etc/iproute2/group_map */
|
|
|
9a3fa7 |
+/* array of devgroups from /etc/iproute2/group */
|
|
|
9a3fa7 |
static struct xtables_lmap *devgroups;
|
|
|
9a3fa7 |
|
|
|
9a3fa7 |
static void devgroup_init(struct xt_entry_match *match)
|
|
|
9a3fa7 |
{
|
|
|
9a3fa7 |
- const char file[] = "/etc/iproute2/group_map";
|
|
|
9a3fa7 |
+ const char file[] = "/etc/iproute2/group";
|
|
|
9a3fa7 |
devgroups = xtables_lmap_init(file);
|
|
|
9a3fa7 |
if (devgroups == NULL && errno != ENOENT)
|
|
|
9a3fa7 |
fprintf(stderr, "Warning: %s: %s\n", file, strerror(errno));
|
|
|
9a3fa7 |
--
|
|
|
9a3fa7 |
2.21.0
|
|
|
9a3fa7 |
|