Merge pull request #1056 from opensourcerouting/oldbits-0

"pathspace" options, vtysh-suid-cleanups, "vty_frame()"

diff --cc bgpd/bgp_evpn_vty.c
index e8e986d1fcd93aaa370844032b9e479e3646c84a,809ffa72ce7cf3f0a999a08be8632994684600bc..e414ad1e67ea91dce29efd0ea520f2ea499db960
--- 1/bgpd/bgp_evpn_vty.c
--- 2/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@@ -47,17 -46,10 +47,12 @@@ struct vni_walk_ctx 
        struct bgp *bgp;
        struct vty *vty;
        struct in_addr vtep_ip;
 +      json_object *json;
  };
  
- struct evpn_config_write {
-       int write;
-       struct vty *vty;
- };
- 
  #if defined(HAVE_CUMULUS)
 -static void display_import_rt(struct vty *vty, struct irt_node *irt)
 +static void display_import_rt(struct vty *vty, struct irt_node *irt,
 +                            json_object *json)
  {
        u_char *pnt;
        u_char type, sub_type;

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_route.h
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/bgpd.h
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lib/vty.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc zebra/interface.c
Simple merge