Merge branch 'master' into manager_only

diff --cc src/defs.h
Simple merge

diff --cc src/dhcp.c
Simple merge

diff --cc src/dhcp6.c
index ed89b4c3c16389d8c1ca4b5b097010e084268e10,76a6719b5c04c1d2f9587951eff18e294560a984..1d00bf815e3200569ede85666a36dbb451cd0891
--- 1/src/dhcp6.c
--- 2/src/dhcp6.c
+++ b/src/dhcp6.c
@@@ -179,7 -179,9 +179,8 @@@ static const char * const dhcp6_statuse
  
  static void dhcp6_bind(struct interface *, const char *, const char *);
  static void dhcp6_failinform(void *);
 -static void dhcp6_recvaddr(void *, unsigned short);
  static void dhcp6_startdecline(struct interface *);
+ static void dhcp6_startrequest(struct interface *);
  
  #ifdef SMALL
  #define dhcp6_hasprefixdelegation(a)  (0)

diff --cc src/dhcpcd.c
index cf74732d87bf795801be8ad913181a97e16c6723,a94dbdacc9bae5290bffce7e2fb4455010b8be29..6e0755e5c8221aa9f49916a762cd81b19373ee0f
--- 1/src/dhcpcd.c
--- 2/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@@ -2359,9 -2469,10 +2398,10 @@@ printpidfile
        /* We have now forked, setsid, forked once more.
         * From this point on, we are the controlling daemon. */
        logdebugx("spawned manager process on PID %d", getpid());
+ 
  start_manager:
        ctx.options |= DHCPCD_STARTED;
 -      if ((pid = pidfile_lock(ctx.pidfile)) != 0) {
 +      if ((pid = pidfile_lock(PIDFILE)) != 0) {
                logerr("%s: pidfile_lock %d", __func__, pid);
  #ifdef PRIVSEP
                /* privsep has not started ... */

diff --cc src/if-options.c
Simple merge

diff --cc src/if-options.h
Simple merge

diff --cc src/if.c
Simple merge

diff --cc src/ipv6.c
Simple merge

diff --cc src/ipv6nd.c
Simple merge

diff --cc src/privsep-control.c
Simple merge

diff --cc src/privsep-inet.c
Simple merge

diff --cc src/privsep-root.c
Simple merge

diff --cc src/privsep.c
Simple merge