Merge remote-tracking branch 'frr/master' into tcp-zebra

diff --cc configure.ac
Simple merge

diff --cc ldpd/lde.c
Simple merge

diff --cc ldpd/ldpd.c
Simple merge

diff --cc lib/libfrr.c
index c901dcc22956cb3dcd9e13c90fbef5311680c8c8,31d93009fa13e86a8514623fa304ac8ec2602665..e5573da90013304ecd1a359eb27ddd52bc6d3cf9
--- 1/lib/libfrr.c
--- 2/lib/libfrr.c
+++ b/lib/libfrr.c
@@@ -19,10 -19,13 +19,14 @@@
   */
  
  #include <zebra.h>
 +#include <sys/un.h>
  
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
  #include "libfrr.h"
  #include "getopt.h"
+ #include "privs.h"
  #include "vty.h"
  #include "command.h"
  #include "version.h"
@@@ -455,13 -399,16 +513,23 @@@ struct thread_master *frr_init(void
        zlog_set_level(ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
  #endif
  
 +      if (!frr_zclient_addr(&zclient_addr, &zclient_addr_len,
 +                            frr_zclientpath)) {
 +              fprintf(stderr, "Invalid zserv socket path: %s\n",
 +                      frr_zclientpath);
 +              exit(1);
 +      }
 +
+       /* don't mkdir these as root... */
+       if (!(di->flags & FRR_NO_PRIVSEP)) {
+               if (!di->pid_file || !di->vty_path)
+                       frr_mkdir(frr_vtydir, false);
+               if (di->pid_file)
+                       frr_mkdir(di->pid_file, true);
+               if (di->vty_path)
+                       frr_mkdir(di->vty_path, true);
+       }
+ 
        frrmod_init(di->module);
        while (modules) {
                modules = (oc = modules)->next;

diff --cc lib/libfrr.h
Simple merge

diff --cc lib/zclient.c
Simple merge

diff --cc lib/zclient.h
Simple merge

diff --cc zebra/main.c
Simple merge

diff --cc zebra/zserv.c
Simple merge