]> git.puffer.fish Git - mirror/frr.git/commitdiff
ospfd: Fix MI redistribution
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 1 Mar 2016 15:03:19 +0000 (10:03 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 1 Mar 2016 18:12:36 +0000 (13:12 -0500)
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>
ospfd/ospf_zebra.c

index 543740c67e10f2d90aa3cb39804068146ae79921..f79d75d476e359a92150c02c85f4b4e4534d7ba8 100644 (file)
@@ -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