[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230719185106.17614-16-gioele@svario.it>
Date: Wed, 19 Jul 2023 20:50:59 +0200
From: Gioele Barabucci <gioele@...rio.it>
To: netdev@...r.kernel.org
Cc: Stephen Hemminger <stephen@...workplumber.org>,
Gioele Barabucci <gioele@...rio.it>
Subject: [iproute2 15/22] lib/rt_names: Read group from /etc and /usr
Signed-off-by: Gioele Barabucci <gioele@...rio.it>
---
lib/rt_names.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/rt_names.c b/lib/rt_names.c
index a96ae540..046a3614 100644
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -633,9 +633,14 @@ static int rtnl_group_init;
static void rtnl_group_initialize(void)
{
+ int ret;
+
rtnl_group_init = 1;
- rtnl_hash_initialize(CONF_ETC_DIR "/group",
- rtnl_group_hash, 256);
+ ret = rtnl_hash_initialize(CONF_ETC_DIR "/group",
+ rtnl_group_hash, 256);
+ if (ret == -ENOENT)
+ rtnl_hash_initialize(CONF_USR_DIR "/group",
+ rtnl_group_hash, 256);
}
int rtnl_group_a2n(int *id, const char *arg)
--
2.39.2
Powered by blists - more mailing lists