From: Igor Ryzhov <iryzhov@nfware.com>
Date: Fri, 7 May 2021 14:05:40 +0000 (+0300)
Subject: ospf6d: always free redistribute config
X-Git-Tag: base_8.1~520^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8696e8be34ab314bafe8797eaf1fad5af33da0b9;p=mirror%2Ffrr.git

ospf6d: always free redistribute config

When the ospf6 instance in unknown VRF is deleted, the redistribution
config is not freed, because it is not registered in zebra. We should
always free the config regardless of zebra registration status.

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

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index c37d89bcb8..6981baba99 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -2302,10 +2302,8 @@ void ospf6_asbr_redistribute_reset(struct ospf6 *ospf6)
 			continue;
 		if (type == ZEBRA_ROUTE_OSPF6)
 			continue;
-		if (ospf6_zebra_is_redistribute(type, ospf6->vrf_id)) {
-			ospf6_asbr_redistribute_unset(ospf6, red, type);
-			ospf6_redist_del(ospf6, red, type);
-		}
+		ospf6_asbr_redistribute_unset(ospf6, red, type);
+		ospf6_redist_del(ospf6, red, type);
 	}
 }