From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 1 Mar 2016 15:03:19 +0000 (-0500)
Subject: ospfd: Fix MI redistribution
X-Git-Tag: frr-2.0-rc1~1087
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=53785cfdbf699b0bb8e5dc6df6689f85c9ee5e77;p=mirror%2Ffrr.git

ospfd: Fix MI redistribution

If we are attempting to redistribute from a MI ospf
then when should only check for the non MI case if
instance was not passed in.

Ticket: CM-9543
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>
---

diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 543740c67e..f79d75d476 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -747,7 +747,7 @@ ospf_is_type_redistributed (int type, u_short instance)
   return (DEFAULT_ROUTE_TYPE (type) ?
     vrf_bitmap_check (zclient->default_information, VRF_DEFAULT) :
     ((instance && redist_check_instance(&zclient->mi_redist[AFI_IP][type], instance))
-     || vrf_bitmap_check (zclient->redist[AFI_IP][type], VRF_DEFAULT)));
+     || (!instance && vrf_bitmap_check (zclient->redist[AFI_IP][type], VRF_DEFAULT))));
 }
 
 int