summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2005-08-10 15:46:11 +0000
committerpaul <paul>2005-08-10 15:46:11 +0000
commit47828747f48ea6739d0af6555648759016462703 (patch)
tree468a87c6176070819c6b43683d1ce46389cd6897
parent1dab30f421d9e6909d498961294fa1f44c76b207 (diff)
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]
-rw-r--r--ospf6d/ChangeLog7
-rw-r--r--ospf6d/ospf6_asbr.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index 9e0505ad..e925d807 100644
--- 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 564efb22..379b629a 100644
--- 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);