From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 2 Feb 2017 15:42:51 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/stable/2.0'
X-Git-Tag: frr-3.0-branchpoint~54
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1a35e2e56533f75d68ed30bf24b3c131da4ba950;p=matthieu%2Ffrr.git

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

1a35e2e56533f75d68ed30bf24b3c131da4ba950
diff --cc ldpd/ldpd.c
index 76eb66d926,927af682a1..4e79f8b8ab
--- a/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 506891ff07,e58d8e4852..fa3789a839
--- a/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 pimd/pim_main.c
index 0749d60b05,e4aa2de594..2e81ac53fd
--- a/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 5b23b2440a,9813b19ced..c1b1d705a4
--- a/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";