summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bgpd/bgp_main.c9
-rw-r--r--ospf6d/ospf6_main.c11
-rw-r--r--ospfd/ospf_main.c6
-rw-r--r--ripd/rip_main.c11
-rw-r--r--ripngd/ripng_main.c11
-rw-r--r--zebra/main.c6
6 files changed, 33 insertions, 21 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index f3c2f3e1..04729229 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -80,9 +80,12 @@ zebra_capabilities_t _caps_p [] =
struct zebra_privs_t bgpd_privs =
{
-#if defined(ZEBRA_USER) && defined(ZEBRA_GROUP)
- .user = ZEBRA_USER,
- .group = ZEBRA_GROUP,
+#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
+ .user = QUAGGA_USER,
+ .group = QUAGGA_GROUP,
+#endif
+#ifdef VTY_GROUP
+ .vty_group = VTY_GROUP,
#endif
.caps_p = _caps_p,
.cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]),
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 6356879a..be46f3fe 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -53,11 +53,14 @@ zebra_capabilities_t _caps_p [] =
struct zebra_privs_t ospf6d_privs =
{
-#if defined(ZEBRA_USER)
- .user = ZEBRA_USER,
+#if defined(QUAGGA_USER)
+ .user = QUAGGA_USER,
#endif
-#if defined ZEBRA_GROUP
- .group = ZEBRA_GROUP,
+#if defined QUAGGA_GROUP
+ .group = QUAGGA_GROUP,
+#endif
+#ifdef VTY_GROUP
+ .vty_group = VTY_GROUP,
#endif
.caps_p = _caps_p,
.cap_num_p = 2,
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 1da285bd..51fa7b58 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -60,9 +60,9 @@ zebra_capabilities_t _caps_p [] =
struct zebra_privs_t ospfd_privs =
{
-#if defined(ZEBRA_USER) && defined(ZEBRA_GROUP)
- .user = ZEBRA_USER,
- .group = ZEBRA_GROUP,
+#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
+ .user = QUAGGA_USER,
+ .group = QUAGGA_GROUP,
#endif
#if defined(VTY_GROUP)
.vty_group = VTY_GROUP,
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index d5713208..a87e3b7e 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -58,11 +58,14 @@ zebra_capabilities_t _caps_p [] =
struct zebra_privs_t ripd_privs =
{
-#if defined(ZEBRA_USER)
- .user = ZEBRA_USER,
+#if defined(QUAGGA_USER)
+ .user = QUAGGA_USER,
#endif
-#if defined ZEBRA_GROUP
- .group = ZEBRA_GROUP,
+#if defined QUAGGA_GROUP
+ .group = QUAGGA_GROUP,
+#endif
+#ifdef VTY_GROUP
+ .vty_group = VTY_GROUP,
#endif
.caps_p = _caps_p,
.cap_num_p = 2,
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 6c335252..9b762674 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -66,11 +66,14 @@ zebra_capabilities_t _caps_p [] =
struct zebra_privs_t ripngd_privs =
{
-#if defined(ZEBRA_USER)
- .user = ZEBRA_USER,
+#if defined(QUAGGA_USER)
+ .user = QUAGGA_USER,
#endif
-#if defined ZEBRA_GROUP
- .group = ZEBRA_GROUP,
+#if defined QUAGGA_GROUP
+ .group = QUAGGA_GROUP,
+#endif
+#ifdef VTY_GROUP
+ .vty_group = VTY_GROUP,
#endif
.caps_p = _caps_p,
.cap_num_p = 2,
diff --git a/zebra/main.c b/zebra/main.c
index c9a19eda..98227ea5 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -80,9 +80,9 @@ zebra_capabilities_t _caps_p [] =
/* zebra privileges to run with */
struct zebra_privs_t zserv_privs =
{
-#if defined(ZEBRA_USER) && defined(ZEBRA_GROUP)
- .user = ZEBRA_USER,
- .group = ZEBRA_GROUP,
+#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
+ .user = QUAGGA_USER,
+ .group = QUAGGA_GROUP,
#endif
#ifdef VTY_GROUP
.vty_group = VTY_GROUP,