# HG changeset patch
# User Roy Marples <roy@marples.name>
# Date 1604096337 0
# Node ID 226b850d158dcea466d2e6b758a93b6608ef558b
# Parent  16610f4104a4a7e6820567982570f0eab45065cf
Fix compile without various defines

diff -r 16610f4104a4 -r 226b850d158d src/dhcp.c
--- a/src/dhcp.c	Fri Oct 30 16:13:49 2020 +0000
+++ b/src/dhcp.c	Fri Oct 30 22:18:57 2020 +0000
@@ -2082,12 +2082,14 @@
 
 #ifdef ARP
 #ifdef KERNEL_RFC5227
+#ifdef ARPING
 static void
 dhcp_arp_announced(struct arp_state *state)
 {
 
 	arp_free(state);
 }
+#endif
 #else
 static void
 dhcp_arp_defend_failed(struct arp_state *astate)
diff -r 16610f4104a4 -r 226b850d158d src/dhcpcd.c
--- a/src/dhcpcd.c	Fri Oct 30 16:13:49 2020 +0000
+++ b/src/dhcpcd.c	Fri Oct 30 22:18:57 2020 +0000
@@ -1422,13 +1422,15 @@
 		return;
 	case SIGUSR2:
 		loginfox(sigmsg, "SIGUSR2", "reopening log");
+#ifdef PRIVSEP
 		if (IN_PRIVSEP(ctx)) {
 			if (ps_root_logreopen(ctx) == -1)
 				logerr("ps_root_logreopen");
-		} else {
-			if (logopen(ctx->logfile) == -1)
-				logerr("logopen");
+			return;
 		}
+#endif
+		if (logopen(ctx->logfile) == -1)
+			logerr("logopen");
 		return;
 	case SIGCHLD:
 		while (waitpid(-1, NULL, WNOHANG) > 0)