2003-08-14 Paul Jakma <paul@dishone.st>

	* zebra/main.c: Fixup ZEBRA_{GROUP,USER} defines ->
	  QUAGGA_{USER,GROUP}
	* bgpd/bgp_main.c: ditto
	* ospf6d/ospf6_main.c: ditto
	* ospfd/ospf_main.c: ditto
	* ripd/rip_main.c: ditto
	* ripngd/ripng_main.c: ditto
	* zebra/main.c: ditto

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index f3c2f3e1da80d258447b0cdec44b8cc32f630ae7..047292297cc3929051fd8c4e0f774de6c7b34441 100644 (file)
--- 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 6356879adab1f79c5b52e5915e8a95255574cd9b..be46f3fee3a03a9bcfce6984bf649e87e225fb90 100644 (file)
--- 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 1da285bd8173cca12e2658dec9ddaf1e9a558bc7..51fa7b5805f8cf9c85c3a5fdba11a0950e52a4c2 100644 (file)
--- 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 d5713208a0c5bb825013944ec237f41429b4d694..a87e3b7eb12f01f5ba53aeb2587151559bd3f1bf 100644 (file)
--- 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 6c3352525f0cbcbe3def05bd6e801ce05d37e08a..9b762674b7ea8a87fffa01d6d5a5682227e1bc40 100644 (file)
--- 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 c9a19eda6ce511366a4b8e72cd938f8d9cd4407d..98227ea51ad9448f41e87baf21047a7cd004d2fd 100644 (file)
--- 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,