From: David Lamparter <equinox@opensourcerouting.org>
Date: Thu, 18 May 2017 10:28:12 +0000 (+0200)
Subject: Merge branch 'stable/3.0'
X-Git-Tag: reindent-master-before~146
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=57463530f3f8b687f238bc76020c0f168b19f0a8;p=mirror%2Ffrr.git

Merge branch 'stable/3.0'

Conflicts:
	ospf6d/ospf6_lsa.c
	ospfd/ospf_vty.c
	zebra/interface.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

57463530f3f8b687f238bc76020c0f168b19f0a8
diff --cc zebra/interface.c
index 7ff782f7cc,317cc722b4..7b0d31338d
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@@ -708,7 -709,10 +708,11 @@@ if_delete_update (struct interface *ifp
       for setting ifindex to IFINDEX_INTERNAL after processing the
       interface deletion message. */
    ifp->ifindex = IFINDEX_INTERNAL;
 +  ifp->node = NULL;
+ 
+   /* if the ifp is in a vrf, move it to default so vrf can be deleted if desired */
+   if (ifp->vrf_id)
+     if_handle_vrf_change (ifp, VRF_DEFAULT);
  }
  
  /* VRF change for an interface */