Fix segfault in ospfd - [quagga-dev 980].

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index ca9dd04de5c3c37c673be4c4bc2c98417cb490c8..249b175d24de72cec76e4bc9f150973e4a95854f 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,14 @@
+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

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 5e2c3a2e74ab32ef0af4f3d6bb172373b7882221..14cd97662a657fde6e7dfa5f54e337c8499f1acc 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -7142,7 +7142,7 @@ config_write_virtual_link (struct vty *vty, struct ospf *ospf)
 
 \f
 char *distribute_str[] = { "system", "kernel", "connected", "static", "rip",
-                          "ripng", "ospf", "ospf6", "bgp"};
+                          "ripng", "ospf", "ospf6", "isis", "bgp"};
 int
 config_write_ospf_redistribute (struct vty *vty, struct ospf *ospf)
 {