eigrpd: Use the eigrp->vrf_id where we can immediately transform

[mirror_frr.git] / eigrpd / eigrp_northbound.c

diff --git a/eigrpd/eigrp_northbound.c b/eigrpd/eigrp_northbound.c
index 3e50d018b229c111afb0edb5d90a8406778fbe58..5eecc333208f3330148696e6e1f276f484cf48aa 100644 (file)
--- a/eigrpd/eigrp_northbound.c
+++ b/eigrpd/eigrp_northbound.c
@@ -746,14 +746,17 @@ static int eigrpd_instance_redistribute_create(enum nb_event event,
                                               union nb_resource *resource)
 {
        struct eigrp_metrics metrics;
+       const char *vrfname;
        struct eigrp *eigrp;
        uint32_t proto;
+       vrf_id_t vrfid;
 
        switch (event) {
        case NB_EV_VALIDATE:
                proto = yang_dnode_get_enum(dnode, "./protocol");
-               if (vrf_bitmap_check(zclient->redist[AFI_IP][proto],
-                                    VRF_DEFAULT))
+               vrfname = yang_dnode_get_string(dnode, "../vrf");
+               vrfid = vrf_name_to_id(vrfname);
+               if (vrf_bitmap_check(zclient->redist[AFI_IP][proto], vrfid))
                        return NB_ERR_INCONSISTENCY;
                break;
        case NB_EV_PREPARE: