summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2021-08-25 18:29:42 +0200
committerIgor Ryzhov <iryzhov@nfware.com>2021-08-26 11:01:22 +0200
commitcfc369c43a375847989645f54fa037a09a622908 (patch)
treeff63e609981e53da21d60be7ea8205f91be064e8
parentMerge pull request #9466 from idryzhov/vrf-netns (diff)
downloadfrr-cfc369c43a375847989645f54fa037a09a622908.tar.xz
frr-cfc369c43a375847989645f54fa037a09a622908.zip
lib: remove unused argument from vrf_cmd_init
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
-rw-r--r--babeld/babeld.c2
-rw-r--r--eigrpd/eigrp_cli.c2
-rw-r--r--isisd/isisd.c2
-rw-r--r--lib/vrf.c3
-rw-r--r--lib/vrf.h3
-rw-r--r--nhrpd/nhrp_vty.c2
-rw-r--r--ospf6d/ospf6_top.c2
-rw-r--r--ospfd/ospf_vty.c2
-rw-r--r--pbrd/pbr_vty.c2
-rw-r--r--pimd/pim_instance.c2
-rw-r--r--ripd/ripd.c2
-rw-r--r--ripngd/ripngd.c2
-rw-r--r--staticd/static_vrf.c2
-rw-r--r--vrrpd/vrrp_vty.c2
-rw-r--r--zebra/zebra_vrf.c2
15 files changed, 15 insertions, 17 deletions
diff --git a/babeld/babeld.c b/babeld/babeld.c
index b9623b64b..3fedde354 100644
--- a/babeld/babeld.c
+++ b/babeld/babeld.c
@@ -819,7 +819,7 @@ babeld_quagga_init(void)
install_element(BABEL_NODE, &babel_ipv6_distribute_list_cmd);
install_element(BABEL_NODE, &babel_no_ipv6_distribute_list_cmd);
- vrf_cmd_init(NULL, &babeld_privs);
+ vrf_cmd_init(NULL);
babel_if_init();
diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c
index 35536979e..c0f6c1129 100644
--- a/eigrpd/eigrp_cli.c
+++ b/eigrpd/eigrp_cli.c
@@ -909,7 +909,7 @@ eigrp_cli_init(void)
install_element(EIGRP_NODE, &eigrp_neighbor_cmd);
install_element(EIGRP_NODE, &eigrp_redistribute_source_metric_cmd);
- vrf_cmd_init(NULL, &eigrpd_privs);
+ vrf_cmd_init(NULL);
if_cmd_init(eigrp_write_interface);
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 43efa0164..a99c19972 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -701,7 +701,7 @@ void isis_vrf_init(void)
vrf_init(isis_vrf_new, isis_vrf_enable, isis_vrf_disable,
isis_vrf_delete, isis_vrf_enable);
- vrf_cmd_init(NULL, &isisd_privs);
+ vrf_cmd_init(NULL);
}
void isis_terminate()
diff --git a/lib/vrf.c b/lib/vrf.c
index 181c29155..79313d66d 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -907,8 +907,7 @@ void vrf_install_commands(void)
install_element(ENABLE_NODE, &no_vrf_debug_cmd);
}
-void vrf_cmd_init(int (*writefunc)(struct vty *vty),
- struct zebra_privs_t *daemon_privs)
+void vrf_cmd_init(int (*writefunc)(struct vty *vty))
{
install_element(CONFIG_NODE, &vrf_cmd);
install_element(CONFIG_NODE, &no_vrf_cmd);
diff --git a/lib/vrf.h b/lib/vrf.h
index 7ce03079d..f8b0148eb 100644
--- a/lib/vrf.h
+++ b/lib/vrf.h
@@ -285,8 +285,7 @@ extern int vrf_switchback_to_initial(void);
/* VRF vty command initialisation
*/
-extern void vrf_cmd_init(int (*writefunc)(struct vty *vty),
- struct zebra_privs_t *daemon_priv);
+extern void vrf_cmd_init(int (*writefunc)(struct vty *vty));
/* VRF vty debugging
*/
diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
index 60ce1e652..764ffe084 100644
--- a/nhrpd/nhrp_vty.c
+++ b/nhrpd/nhrp_vty.c
@@ -1259,7 +1259,7 @@ void nhrp_config_init(void)
install_element(CONFIG_NODE, &nhrp_multicast_nflog_group_cmd);
install_element(CONFIG_NODE, &no_nhrp_multicast_nflog_group_cmd);
- vrf_cmd_init(NULL, &nhrpd_privs);
+ vrf_cmd_init(NULL);
/* interface specific commands */
if_cmd_init(interface_config_write);
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index fc181a6d1..ad2d503da 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -238,7 +238,7 @@ void ospf6_vrf_init(void)
vrf_init(ospf6_vrf_new, ospf6_vrf_enable, ospf6_vrf_disable,
ospf6_vrf_delete, ospf6_vrf_enable);
- vrf_cmd_init(NULL, &ospf6d_privs);
+ vrf_cmd_init(NULL);
}
static void ospf6_top_lsdb_hook_add(struct ospf6_lsa *lsa)
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 4c248c0df..b5c16dc65 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -12984,7 +12984,7 @@ void ospf_vty_init(void)
install_element(OSPF_NODE, &ospf_max_multipath_cmd);
install_element(OSPF_NODE, &no_ospf_max_multipath_cmd);
- vrf_cmd_init(NULL, &ospfd_privs);
+ vrf_cmd_init(NULL);
/* Init interface related vty commands. */
ospf_vty_if_init();
diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
index 2936d1e34..0e6228423 100644
--- a/pbrd/pbr_vty.c
+++ b/pbrd/pbr_vty.c
@@ -1229,7 +1229,7 @@ void pbr_vty_init(void)
{
cmd_variable_handler_register(pbr_map_name);
- vrf_cmd_init(NULL, &pbr_privs);
+ vrf_cmd_init(NULL);
if_cmd_init(pbr_interface_config_write);
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index 6dda66b79..79f01a8da 100644
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -231,7 +231,7 @@ void pim_vrf_init(void)
vrf_init(pim_vrf_new, pim_vrf_enable, pim_vrf_disable,
pim_vrf_delete, NULL);
- vrf_cmd_init(pim_vrf_config_write, &pimd_privs);
+ vrf_cmd_init(pim_vrf_config_write);
}
void pim_vrf_terminate(void)
diff --git a/ripd/ripd.c b/ripd/ripd.c
index 3d1427c3b..9efceb3d5 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3696,7 +3696,7 @@ void rip_vrf_init(void)
vrf_init(rip_vrf_new, rip_vrf_enable, rip_vrf_disable, rip_vrf_delete,
rip_vrf_enable);
- vrf_cmd_init(NULL, &ripd_privs);
+ vrf_cmd_init(NULL);
}
void rip_vrf_terminate(void)
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index cbd2c2289..1186ffeb9 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2692,7 +2692,7 @@ void ripng_vrf_init(void)
vrf_init(ripng_vrf_new, ripng_vrf_enable, ripng_vrf_disable,
ripng_vrf_delete, ripng_vrf_enable);
- vrf_cmd_init(NULL, &ripngd_privs);
+ vrf_cmd_init(NULL);
}
void ripng_vrf_terminate(void)
diff --git a/staticd/static_vrf.c b/staticd/static_vrf.c
index 96e5d37d6..4b68729f8 100644
--- a/staticd/static_vrf.c
+++ b/staticd/static_vrf.c
@@ -175,7 +175,7 @@ void static_vrf_init(void)
vrf_init(static_vrf_new, static_vrf_enable,
static_vrf_disable, static_vrf_delete, NULL);
- vrf_cmd_init(static_vrf_config_write, &static_privs);
+ vrf_cmd_init(static_vrf_config_write);
}
void static_vrf_terminate(void)
diff --git a/vrrpd/vrrp_vty.c b/vrrpd/vrrp_vty.c
index 1904e936c..91ff6fe28 100644
--- a/vrrpd/vrrp_vty.c
+++ b/vrrpd/vrrp_vty.c
@@ -762,7 +762,7 @@ void vrrp_vty_init(void)
{
install_node(&debug_node);
install_node(&vrrp_node);
- vrf_cmd_init(NULL, &vrrp_privs);
+ vrf_cmd_init(NULL);
if_cmd_init(vrrp_config_write_interface);
install_element(VIEW_NODE, &vrrp_vrid_show_cmd);
diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c
index a2a671e95..19ac041dc 100644
--- a/zebra/zebra_vrf.c
+++ b/zebra/zebra_vrf.c
@@ -594,7 +594,7 @@ void zebra_vrf_init(void)
vrf_init(zebra_vrf_new, zebra_vrf_enable, zebra_vrf_disable,
zebra_vrf_delete, zebra_vrf_update);
- vrf_cmd_init(vrf_config_write, &zserv_privs);
+ vrf_cmd_init(vrf_config_write);
if (vrf_is_backend_netns() && ns_have_netns()) {
/* Install NS commands. */