From: Roy Marples <roy@marples.name>
Date: Sat, 15 Jun 2024 13:09:31 +0000 (+0100)
Subject: Merge branch 'master' into manager_only
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmanager_only;p=thirdparty%2Fdhcpcd.git

Merge branch 'master' into manager_only
---

66811c7b9b03ff4f9f859ef7142f8bd07c4c12f1
diff --cc src/dhcp6.c
index ed89b4c3,76a6719b..1d00bf81
--- a/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 cf74732d,a94dbdac..6e0755e5
--- a/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 ... */