If the nexthop is only resolved over a default route and that is not

explicitly allowed, don't treat it as a change for routes using this
nexthop, unless the resolution has really changed.

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index f5bd1463aa4997e48d8c12858b090fa0a8f988a0..73a81b13604c335d31123bbe903d7ca45d07ffc8 100644 (file)
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -389,6 +389,12 @@ zebra_evaluate_rnh (int vrfid, int family, int force, rnh_type_t type,
          goto loopend;
        }
 
+      /* If nexthop cannot be resolved and that is also the existing state,
+       * there is nothing further to do.
+       */
+      if (!rib && rnh->state == NULL)
+        goto loopend;
+
       /* Ensure prefixes we're resolving over have stayed the same */
       if (!prefix_same(&rnh->resolved_route, &prn->p))
        {