Merge remote-tracking branch 'origin/stable/2.0'

diff --cc .gitignore
Simple merge

diff --cc bgpd/bgp_bfd.c
Simple merge

diff --cc bgpd/bgp_dump.c
Simple merge

diff --cc bgpd/bgp_main.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc debian/changelog
Simple merge

diff --cc isisd/isis_tlv.c
Simple merge

diff --cc isisd/isis_tlv.h
Simple merge

diff --cc ldpd/ldp_vty_exec.c
Simple merge

diff --cc ldpd/ldpd.c
index 76eb66d9263808960a7c5adff288e94cbe48433f,927af682a106e87ef0c8880d7b8761e87a4f0207..4e79f8b8ab54345eb612e01365ca6a0ee191968c
--- 1/ldpd/ldpd.c
--- 2/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@@ -39,12 -39,12 +39,13 @@@
  #include "sigevent.h"
  #include "zclient.h"
  #include "vrf.h"
 +#include "filter.h"
+ #include "sockopt.h"
  #include "qobj.h"
  
  static void            ldpd_shutdown(void);
 -static pid_t           start_child(enum ldpd_process, char *, int,
 +static pid_t           start_child(enum ldpd_process, char *, int, int,
-                           const char *, const char *);
+                           const char *, const char *, const char *);
  static int             main_dispatch_ldpe(struct thread *);
  static int             main_dispatch_lde(struct thread *);
  static int             main_imsg_send_ipc_sockets(struct imsgbuf *,
@@@ -374,9 -397,9 +411,11 @@@ main(int argc, char *argv[]
  
        /* start children */
        lde_pid = start_child(PROC_LDE_ENGINE, saved_argv0,
-           pipe_parent2lde[1], pipe_parent2lde_sync[1], user, group);
 -          pipe_parent2lde[1], user, group, ctl_sock_custom_path);
++          pipe_parent2lde[1], pipe_parent2lde_sync[1],
++          user, group, ctl_sock_custom_path);
        ldpe_pid = start_child(PROC_LDP_ENGINE, saved_argv0,
-           pipe_parent2ldpe[1], pipe_parent2ldpe_sync[1], user, group);
 -          pipe_parent2ldpe[1], user, group, ctl_sock_custom_path);
++          pipe_parent2ldpe[1], pipe_parent2ldpe_sync[1],
++          user, group, ctl_sock_custom_path);
  
        /* drop privileges */
        if (user)
@@@ -493,10 -494,10 +532,10 @@@ ldpd_shutdown(void
  }
  
  static pid_t
 -start_child(enum ldpd_process p, char *argv0, int fd, const char *user,
 -    const char *group, const char *ctl_sock_custom_path)
 +start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync,
-     const char *user, const char *group)
++    const char *user, const char *group, const char *ctl_sock_custom_path)
  {
-       char    *argv[7];
+       char    *argv[9];
        int      argc = 0;
        pid_t    pid;
  

diff --cc ldpd/ldpd.h
index 506891ff0733ca7aa23aab7b14e15715a4a0d7f8,e58d8e4852c5706336e97562e9b0ced2c48cc99d..fa3789a8394435fafd796d41ec0d924c24518b10
--- 1/ldpd/ldpd.h
--- 2/ldpd/ldpd.h
+++ b/ldpd/ldpd.h
@@@ -715,10 -672,10 +715,11 @@@ int              sock_set_ipv6_mcast_loop(int)
  
  /* quagga */
  extern struct thread_master   *master;
+ extern char                    ctl_sock_path[MAXPATHLEN];
  
  /* ldp_zebra.c */
 -void          ldp_zebra_init(struct thread_master *);
 +void           ldp_zebra_init(struct thread_master *);
 +void           ldp_zebra_destroy(void);
  
  /* compatibility */
  #ifndef __OpenBSD__

diff --cc ldpd/ldpe.c
Simple merge

diff --cc ldpd/ldpe.h
Simple merge

diff --cc lib/plist.c
Simple merge

diff --cc lib/sockopt.c
Simple merge

diff --cc lib/sockopt.h
Simple merge

diff --cc lib/vty.c
Simple merge

diff --cc pimd/pim_main.c
index 0749d60b0553b2aa474a066de34f25fe89b8d7cb,e4aa2de594597d0996c3b3fe0bbe18bf23a3dcfd..2e81ac53fd05737db2bc98003c3ed8110a1b89a6
--- 1/pimd/pim_main.c
--- 2/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@@ -103,10 -111,20 +111,11 @@@ Daemon which manages PIM.\n\n
  -z, --socket         Set path of zebra socket\n\
  -A, --vty_addr       Set vty's bind address\n\
  -P, --vty_port       Set vty's port number\n\
+     --vty_socket     Override vty socket path\n\
  -v, --version        Print program version\n\
 -"
 -
 -#ifdef PIM_ZCLIENT_DEBUG
 -"\
 --Z, --debug_zclient  Enable zclient debugging\n\
 -"
 -#endif
 -
 -"\
  -h, --help           Display this help and exit\n\
  \n\
 -Report bugs to %s\n", progname, PIMD_BUG_ADDRESS);
 +Report bugs to %s\n", progname, PACKAGE_BUGREPORT);
    }
  
    exit (status);

diff --cc vtysh/extract.pl.in
index 5b23b2440a9739d946ff70657a7b2516de95394b,9813b19ced14172453b43af5d0655eff9bd5ff92..c1b1d705a4d5c7368e7ec3909493e3199c074158
--- 1/vtysh/extract.pl.in
--- 2/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@@ -60,8 -60,12 +60,11 @@@ $ignore{'"address-family ipv6 [<unicast
  $ignore{'"address-family vpnv4"'} = "ignore";
  $ignore{'"address-family vpnv4 unicast"'} = "ignore";
  $ignore{'"address-family ipv4 vrf NAME"'} = "ignore";
 -$ignore{'"address-family encap"'} = "ignore";
 -$ignore{'"address-family encapv4"'} = "ignore";
 +$ignore{'"address-family <encap|encapv4>"'} = "ignore";
  $ignore{'"address-family encapv6"'} = "ignore";
+ $ignore{'"address-family ipv4 encap"'} = "ignore";
+ $ignore{'"address-family ipv6 encap"'} = "ignore";
+ $ignore{'"address-family ipv6 vpn"'} = "ignore";
  $ignore{'"address-family vpnv6"'} = "ignore";
  $ignore{'"address-family vpnv6 unicast"'} = "ignore";
  $ignore{'"exit-address-family"'} = "ignore";

diff --cc vtysh/vtysh.c
Simple merge

diff --cc vtysh/vtysh_user.c
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/zebra_ptm.c
Simple merge