From: Lou Berger <lberger@labn.net>
Date: Fri, 30 Nov 2018 19:35:25 +0000 (+0000)
Subject: bgpd: partially revert e23b9ef6d271223d29c7f91a10d98aa6dcd252b3
X-Git-Tag: frr-7.1-dev~139^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9d94d5e81269d0f526a82f3405411dec2b52eeb5;p=matthieu%2Ffrr.git

bgpd: partially revert e23b9ef6d271223d29c7f91a10d98aa6dcd252b3
      previous change was to fix rnh module in Zebra for leaked routes
      this reverts that fix, so probably reintroduces the problem.

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 6668823d64..baf2c1e029 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -578,7 +578,7 @@ leak_update(struct bgp *bgp, /* destination bgp instance */
 		return bpi;
 	}
 
-	new = info_make(bpi_ultimate->type, bpi_ultimate->sub_type, 0,
+	new = info_make(bpi_ultimate->type, BGP_ROUTE_IMPORTED, 0,
 		bgp->peer_self, new_attr, bn);
 
 	if (nexthop_self_flag)