? DEADJOE
? cscope.out
? doc/quagga-single.html
? lib/aaa-notes.txt
? vtysh/vtyd_main.c
Index: bgpd/bgp_main.c
===================================================================
RCS file: /var/cvsroot/quagga/bgpd/bgp_main.c,v
retrieving revision 1.16
diff -u -r1.16 bgp_main.c
--- bgpd/bgp_main.c	7 Dec 2004 15:39:31 -0000	1.16
+++ bgpd/bgp_main.c	7 Apr 2005 15:09:55 -0000
@@ -62,20 +62,20 @@
 struct quagga_signal_t bgp_signals[] = 
 {
   { 
-    .signal = SIGHUP, 
-    .handler = &sighup,
+    SIGHUP, 
+    &sighup,
   },
   {
-    .signal = SIGUSR1,
-    .handler = &sigusr1,
+    SIGUSR1,
+    &sigusr1,
   },
   {
-    .signal = SIGINT,
-    .handler = &sigint,
+    SIGINT,
+    &sigint,
   },
   {
-    .signal = SIGTERM,
-    .handler = &sigint,
+    SIGTERM,
+    &sigint,
   },
 };
 
@@ -107,16 +107,24 @@
 
 struct zebra_privs_t bgpd_privs =
 {
+  _caps_p,
+  NULL,
+  sizeof(_caps_p)/sizeof(_caps_p[0]),
+  0,
 #if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+  QUAGGA_USER,
+  QUAGGA_GROUP,
+#else
+  NULL,
+  NULL,
 #endif
 #ifdef VTY_GROUP
-  .vty_group = VTY_GROUP,
+  VTY_GROUP,
+#else
+  NULL,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]),
-  .cap_num_i = 0,
+  NULL,
+  NULL,
 };
 
 /* Help information display. */
Index: ospf6d/ospf6_main.c
===================================================================
RCS file: /var/cvsroot/quagga/ospf6d/ospf6_main.c,v
retrieving revision 1.19
diff -u -r1.19 ospf6_main.c
--- ospf6d/ospf6_main.c	7 Dec 2004 15:39:32 -0000	1.19
+++ ospf6d/ospf6_main.c	7 Apr 2005 15:10:03 -0000
@@ -52,18 +52,30 @@
 
 struct zebra_privs_t ospf6d_privs =
 {
+  _caps_p,
+  NULL,
+  2,
+  0,
 #if defined(QUAGGA_USER)
-  .user = QUAGGA_USER,
+  QUAGGA_USER,
+#else
+  NULL,
 #endif
+
 #if defined QUAGGA_GROUP
-  .group = QUAGGA_GROUP,
+  QUAGGA_GROUP,
+#else 
+  NULL,
 #endif
+
 #ifdef VTY_GROUP
-  .vty_group = VTY_GROUP,
+  VTY_GROUP,
+#else
+  NULL,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = 2,
-  .cap_num_i = 0
+
+  NULL,
+  NULL,
 };
 
 /* ospf6d options, we use GNU getopt library. */
Index: ospfd/ospf_lsa.c
===================================================================
RCS file: /var/cvsroot/quagga/ospfd/ospf_lsa.c,v
retrieving revision 1.35
diff -u -r1.35 ospf_lsa.c
--- ospfd/ospf_lsa.c	7 Apr 2005 07:30:25 -0000	1.35
+++ ospfd/ospf_lsa.c	7 Apr 2005 15:10:03 -0000
@@ -1844,12 +1844,10 @@
     {
       /* find the translated Type-5 for this Type-7 */
       struct as_external_lsa *ext = (struct as_external_lsa *)(type7->data);
-      struct prefix_ipv4 p = 
-        { 
-          .prefix = type7->data->id,
-          .prefixlen = ip_masklen (ext->mask),
-          .family = AF_INET,
-        };
+      struct prefix_ipv4 p; 
+      p.prefix = type7->data->id,
+      p.prefixlen = ip_masklen (ext->mask),
+      p.family = AF_INET,
 
       type5 = ospf_external_info_find_lsa (ospf, &p);
     }
Index: ospfd/ospf_main.c
===================================================================
RCS file: /var/cvsroot/quagga/ospfd/ospf_main.c,v
retrieving revision 1.22
diff -u -r1.22 ospf_main.c
--- ospfd/ospf_main.c	7 Dec 2004 15:39:32 -0000	1.22
+++ ospfd/ospf_main.c	7 Apr 2005 15:10:03 -0000
@@ -60,16 +60,25 @@
 
 struct zebra_privs_t ospfd_privs =
 {
+  _caps_p,
+  NULL,
+  sizeof(_caps_p)/sizeof(_caps_p[0]),
+  0,
 #if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
-#endif
+  QUAGGA_USER,
+  QUAGGA_GROUP,
+#else
+  NULL,
+  NULL,
+#endif /* defined(QUAGGA_USER) && defined(QUAGGA_GROUP) */
+
 #if defined(VTY_GROUP)
-  .vty_group = VTY_GROUP,
+   VTY_GROUP,
+#else
+   NULL,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]),
-  .cap_num_i = 0
+   NULL,
+   NULL,
 };
 
 /* Configuration filename and directory. */
@@ -158,20 +167,20 @@
 struct quagga_signal_t ospf_signals[] =
 {
   {
-    .signal = SIGHUP,
-    .handler = &sighup,
+    SIGHUP,
+    &sighup,
   },
   {
-    .signal = SIGUSR1,
-    .handler = &sigusr1,
+    SIGUSR1,
+    &sigusr1,
   },  
   {
-    .signal = SIGINT,
-    .handler = &sigint,
+    SIGINT,
+    &sigint,
   },
   {
-    .signal = SIGTERM,
-    .handler = &sigint,
+    SIGTERM,
+    &sigint,
   },
 };
 
Index: ripd/rip_main.c
===================================================================
RCS file: /var/cvsroot/quagga/ripd/rip_main.c,v
retrieving revision 1.15
diff -u -r1.15 rip_main.c
--- ripd/rip_main.c	7 Dec 2004 15:39:33 -0000	1.15
+++ ripd/rip_main.c	7 Apr 2005 15:10:03 -0000
@@ -60,18 +60,30 @@
 
 struct zebra_privs_t ripd_privs =
 {
+  _caps_p,
+  NULL,
+  2,
+  0,
 #if defined(QUAGGA_USER)
-  .user = QUAGGA_USER,
+  QUAGGA_USER,
+#else
+  NULL,
 #endif
+
 #if defined QUAGGA_GROUP
-  .group = QUAGGA_GROUP,
+  QUAGGA_GROUP,
+#else
+  NULL,
 #endif
+
 #ifdef VTY_GROUP
-  .vty_group = VTY_GROUP,
+  VTY_GROUP,
+#else
+  NULL,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = 2,
-  .cap_num_i = 0
+
+  NULL,
+  NULL,
 };
 
 /* Configuration file and directory. */
@@ -162,20 +174,20 @@
 struct quagga_signal_t ripd_signals[] =
 {
   { 
-    .signal = SIGHUP,
-    .handler = &sighup,
+    SIGHUP,
+    &sighup,
   },
   { 
-    .signal = SIGUSR1,
-    .handler = &sigusr1,
+    SIGUSR1,
+    &sigusr1,
   },
   {
-    .signal = SIGINT,
-    .handler = &sigint,
+    SIGINT,
+    &sigint,
   },
   {
-    .signal = SIGTERM,
-    .handler = &sigint,
+    SIGTERM,
+    &sigint,
   },
 };  
 
Index: ripngd/ripng_main.c
===================================================================
RCS file: /var/cvsroot/quagga/ripngd/ripng_main.c,v
retrieving revision 1.15
diff -u -r1.15 ripng_main.c
--- ripngd/ripng_main.c	7 Dec 2004 15:39:33 -0000	1.15
+++ ripngd/ripng_main.c	7 Apr 2005 15:10:03 -0000
@@ -67,18 +67,30 @@
 
 struct zebra_privs_t ripngd_privs =
 {
+  _caps_p,
+  NULL,
+  2,
+  0,
 #if defined(QUAGGA_USER)
-  .user = QUAGGA_USER,
+  QUAGGA_USER,
+#else
+  NULL,
 #endif
+
 #if defined QUAGGA_GROUP
-  .group = QUAGGA_GROUP,
+  QUAGGA_GROUP,
+#else 
+  NULL,
 #endif
+
 #ifdef VTY_GROUP
-  .vty_group = VTY_GROUP,
+  VTY_GROUP,
+#else
+  NULL,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = 2,
-  .cap_num_i = 0
+
+  NULL,
+  NULL,
 };
 
 
@@ -164,20 +176,20 @@
 struct quagga_signal_t ripng_signals[] =
 {
   { 
-    .signal = SIGHUP, 
-    .handler = &sighup,
+    SIGHUP, 
+    &sighup,
   },
   {
-    .signal = SIGUSR1,
-    .handler = &sigusr1,
+    SIGUSR1,
+    &sigusr1,
   },
   {
-    .signal = SIGINT,
-    .handler = &sigint,
+    SIGINT,
+    &sigint,
   },
   {
-    .signal = SIGTERM,
-    .handler = &sigint,
+    SIGTERM,
+    &sigint,
   },
 };
 
Index: zebra/main.c
===================================================================
RCS file: /var/cvsroot/quagga/zebra/main.c,v
retrieving revision 1.21
diff -u -r1.21 main.c
--- zebra/main.c	16 Jan 2005 23:34:02 -0000	1.21
+++ zebra/main.c	7 Apr 2005 15:10:03 -0000
@@ -41,7 +41,9 @@
 /* Zebra instance */
 struct zebra_t zebrad =
 {
-  .rtm_table_default = 0,
+  NULL, 
+  NULL,
+  0,
 };
 
 /* process id. */
@@ -94,16 +96,25 @@
 /* zebra privileges to run with */
 struct zebra_privs_t zserv_privs =
 {
+  _caps_p,
+  NULL,
+  sizeof(_caps_p)/sizeof(_caps_p[0]),
+  0,
 #if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+  QUAGGA_USER,
+  QUAGGA_GROUP,
+#else
+  NULL,
+  NULL,
 #endif
+
 #ifdef VTY_GROUP
-  .vty_group = VTY_GROUP,
+  VTY_GROUP,
+#else
+  NULL,
 #endif
-  .caps_p = _caps_p,
-  .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]),
-  .cap_num_i = 0
+  NULL,
+  NULL,
 };
 
 /* Default configuration file path. */
@@ -186,20 +197,20 @@
 struct quagga_signal_t zebra_signals[] =
 {
   { 
-    .signal = SIGHUP, 
-    .handler = &sighup,
+    SIGHUP, 
+    &sighup,
   },
   {
-    .signal = SIGUSR1,
-    .handler = &sigusr1,
+    SIGUSR1,
+    &sigusr1,
   },
   {
-    .signal = SIGINT,
-    .handler = &sigint,
+    SIGINT,
+    &sigint,
   },
   {
-    .signal = SIGTERM,
-    .handler = &sigint,
+    SIGTERM,
+    &sigint,
   },
 };