2005-08-09 Paul Jakma <paul.jakma@sun.com>

	* ospf6_asbr.c: (ospf6_asbr_redistribute_add) Fix sense of testing
	  of route_map_apply return code, it can return many things other
	  than RMAP_MATCH which do not indicate DENY. Should test explicitly
	  for equality to RMAP_DENYMATCH instead.

	[backport candidate]

diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index 9e0505adb422978e5538e99ccb5bc1940bb25b9c..e925d807b0ee693001c7302ac170400620dbdef5 100644 (file)
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-09 Paul Jakma <paul.jakma@sun.com>
+
+       * ospf6_asbr.c: (ospf6_asbr_redistribute_add) Fix sense of testing
+         of route_map_apply return code, it can return many things other
+         than RMAP_MATCH which do not indicate DENY. Should test explicitly
+         for equality to RMAP_DENYMATCH instead.
+
 2005-06-24 Harald Welte <laforge@gnumonks.org>
 
        * ospf6_abr.[ch], ospf6_area.[ch]: Add area filter-list (in|out)

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 564efb2255f69966b9dcfc87495e32ebea109764..379b629a251b0c428354bc6d9bd0ab489381ac7e 100644 (file)
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -478,7 +478,7 @@ ospf6_asbr_redistribute_add (int type, int ifindex, struct prefix *prefix,
 
       ret = route_map_apply (ospf6->rmap[type].map, prefix,
                              RMAP_OSPF6, &troute);
-      if (ret != RMAP_MATCH)
+      if (ret == RMAP_DENYMATCH)
         {
           if (IS_OSPF6_DEBUG_ASBR)
             zlog_debug ("Denied by route-map \"%s\"", ospf6->rmap[type].name);