summaryrefslogtreecommitdiff
path: root/ospfd
diff options
context:
space:
mode:
authorhasso <hasso>2004-03-20 18:59:59 +0000
committerhasso <hasso>2004-03-20 18:59:59 +0000
commit42ed9da7b646ce4b05ffafcae805a3018fb6f164 (patch)
treebc0e07510546d644d1e297ed44350f7c74e8072e /ospfd
parent158cdad448eee409025b91ee152c505a62840cc3 (diff)
Fix segfault in ospfd - [quagga-dev 980].
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ChangeLog11
-rw-r--r--ospfd/ospf_vty.c2
2 files changed, 12 insertions, 1 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index ca9dd04d..249b175d 100644
--- 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 5e2c3a2e..14cd9766 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -7142,7 +7142,7 @@ config_write_virtual_link (struct vty *vty, struct ospf *ospf)
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)
{