Fix compile without various defines

diff --git a/src/dhcp.c b/src/dhcp.c
index 5af6de329d5bcd60560954db46d617f9f2030f80..647a0aaa78b4ab2310269debcf588987e270af85 100644 (file)
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -2082,12 +2082,14 @@ dhcp_addr_duplicated(struct interface *ifp, struct in_addr *ia)
 
 #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 --git a/src/dhcpcd.c b/src/dhcpcd.c
index 9e508a69ad3b0858dd81fed47a046ce8ff02d575..f106abd9e98981711430f02ae89a9d0726092437 100644 (file)
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -1422,13 +1422,15 @@ dhcpcd_signal_cb(int sig, void *arg)
                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)