ospfd: free "default-information originate" config when removing router

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 8e047cd9c92728b6a957e0b31604c7b151d471fd..2b9457d8b99619f2408c49f7a26973161ff160ce 100644 (file)
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -697,6 +697,7 @@ static void ospf_finish_final(struct ospf *ospf)
        struct ospf_area *area;
        struct ospf_vl_data *vl_data;
        struct listnode *node, *nnode;
+       struct ospf_redist *red;
        int i;
 
        QOBJ_UNREG(ospf);
@@ -710,7 +711,6 @@ static void ospf_finish_final(struct ospf *ospf)
        /* Unregister redistribution */
        for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
                struct list *red_list;
-               struct ospf_redist *red;
 
                red_list = ospf->redist[i];
                if (!red_list)
@@ -721,7 +721,12 @@ static void ospf_finish_final(struct ospf *ospf)
                        ospf_redist_del(ospf, i, red->instance);
                }
        }
-       ospf_redistribute_default_set(ospf, DEFAULT_ORIGINATE_NONE, 0, 0);
+       red = ospf_redist_lookup(ospf, DEFAULT_ROUTE, 0);
+       if (red) {
+               ospf_routemap_unset(red);
+               ospf_redist_del(ospf, DEFAULT_ROUTE, 0);
+               ospf_redistribute_default_set(ospf, DEFAULT_ORIGINATE_NONE, 0, 0);
+       }
 
        for (ALL_LIST_ELEMENTS(ospf->areas, node, nnode, area))
                ospf_remove_vls_through_area(ospf, area);