From: hasso <hasso>
Date: Sat, 20 Mar 2004 20:06:15 +0000 (+0000)
Subject: Fixing ospf6d as well and move Changelog entry from ospfd to general one.
X-Git-Tag: frr-2.0-rc1~3762
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=37318657e5af8774a7a1446157f99496e887719f;p=matthieu%2Ffrr.git

Fixing ospf6d as well and move Changelog entry from ospfd to general one.
---

diff --git a/ChangeLog b/ChangeLog
index d2c2428bc6..075da2d1d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-20 Michael Bruening <mike@vailsys.com>
+
+	* ospfd/ospf_vty.c: Completed array distribute_str of route types with
+	  addition of "isis". This array must be indexed by
+	  ZEBRA_ROUTE_(SYSTEM|KERNEL|...) defines in zebra.h, and should
+	  be updated with every route type addition. This fix allows
+	  commands redistributing routes from (bgp|isis), like "router ospf
+	  redistribute bgp ...", to be written to terminal, memory, file,
+	  which would otherwise result in a seg fault or, possibly, config
+	  file corruption. Overlooked in import of isisd.
+	* Similar fixes to bgpd/bgp_vty.c ospf6d/ospf6_asbr.c ripd/rip_zebra.c
+	  and ripngd/ripng_zebra.c.
+
 2004-03-17 Jean-Yves Simon <lethalwp@tiscali.be>
 	
 	* zebra/main.c, ripd/rip_main.c: Fix typos sigusr1 -> sigint,
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index deb708ac68..5846ab8a76 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -56,12 +56,12 @@ char *
 zroute_name[] =
 { 
   "system", "kernel", "connected", "static",
-  "rip", "ripng", "ospf", "ospf6", "bgp", "unknown"
+  "rip", "ripng", "ospf", "ospf6", "isis", "bgp", "unknown"
 };
 char *
 zroute_abname[] =
 {
-  "X", "K", "C", "S", "R", "R", "O", "O", "B", "?"
+  "X", "K", "C", "S", "R", "R", "O", "O", "I", "B", "?"
 };
 
 #define ZROUTE_NAME(x) \
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 249b175d24..ca9dd04de5 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,14 +1,3 @@
-2004-03-20 Michael Bruening <mike@vailsys.com>
-
-	* ospf_vty.c: Completed array distribute_str of route types with
-	  addition of "isis". This array must be indexed by
-	  ZEBRA_ROUTE_(SYSTEM|KERNEL|...) defines in zebra.h, and should
-	  be updated with every route type addition. This fix allows
-	  commands redistributing routes from (bgp|isis), like "router ospf
-	  redistribute bgp ...", to be written to terminal, memory, file,
-	  which would otherwise result in a seg fault or, possibly, config
-	  file corruption. Overlooked in import of isisd.
-
 2004-03-18 Amir Guindehi <amir@datacore.ch>
 
 	* ospf_opaque.c: Attempt to correct the incorrect behavior of