[ospfd] redistribute default no longer works after complete reconfig, fix

2006-08-27 J.J. Krabbendam <jkrabbendam@aimsys.nl>

	* ospfd.c: (ospf_finish_final) default redistribute should be
	  unset too, fixes bug where reconfiguring ospfd completely
	  can no longer enable default redistribution.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 1d7a4a1e94ac194a2cc7d6af8ff5936efcc6003b..0015ee6df3937ea326bf21adc832fcbc106667f7 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-27 J.J. Krabbendam <jkrabbendam@aimsys.nl>
+
+       * ospfd.c: (ospf_finish_final) default redistribute should be
+         unset too, fixes bug where reconfiguring ospfd completely
+         can no longer enable default redistribution.
+
 2006-08-25 Paul Jakma <paul.jakma@sun.com>
 
        * (general) Bug #134. Be more robust to backward time changes,

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index a1f0f0111f794ebefabf07df4ac0d0a6612fd398..8c151d98a2fc060d5639ee715ae2928a00f035f2 100644 (file)
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -398,6 +398,7 @@ ospf_finish_final (struct ospf *ospf)
   /* Unregister redistribution */
   for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
     ospf_redistribute_unset (ospf, i);
+  ospf_redistribute_default_unset (ospf);
 
   for (ALL_LIST_ELEMENTS (ospf->areas, node, nnode, area))
     ospf_remove_vls_through_area (ospf, area);