NetworkConfiguration
diff --git a/‎compat/crypt/sha256.c‎
Lines changed: 5 additions & 1 deletion b/‎compat/crypt/sha256.c‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/dhcpcd.c‎
Lines changed: 9 additions & 4 deletions b/‎src/dhcpcd.c‎
Lines changed: 9 additions & 4 deletions
@@ -24,8 +24,12 @@
  * SUCH DAMAGE.
  */
 
-#include <inttypes.h>
+/* For BSD */
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
 
+#include <inttypes.h>
 #include <string.h>
 
 #ifdef __GLIBC__
 
@@ -1576,10 +1576,11 @@ dhcpcd_signal_cb(int sig, void *arg)
 	    stop_all_interfaces(ctx, opts))
 	{
 		/* We stopped something, we will exit once that is done. */
+		eloop_exitallinners(exit_code);
 		return;
 	}
 
-	eloop_exit(ctx->eloop, exit_code);
+	eloop_exitall(exit_code);
 }
 #endif
 
@@ -2309,9 +2310,13 @@ main(int argc, char **argv, char **envp)
 		signal(dhcpcd_signals_ignore[si], SIG_IGN);
 
 	/* Save signal mask, block and redirect signals to our handler */
-	eloop_signal_set_cb(ctx.eloop,
+	if (eloop_signal_set_cb(ctx.eloop,
 	    dhcpcd_signals, dhcpcd_signals_len,
-	    dhcpcd_signal_cb, &ctx);
+	    dhcpcd_signal_cb, &ctx) == -1)
+	{
+		logerr("%s: eloop_signal_set_cb", __func__);
+		goto exit_failure;
+	}
 	if (eloop_signal_mask(ctx.eloop) == -1) {
 		logerr("%s: eloop_signal_mask", __func__);
 		goto exit_failure;
@@ -2789,7 +2794,7 @@ main(int argc, char **argv, char **envp)
 	if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED))
 		loginfox(PACKAGE " exited");
 #ifdef PRIVSEP
-	if (ps_root_stop(&ctx) == -1)
+	if (ctx.ps_root != NULL && ps_root_stop(&ctx) == -1)
 		i = EXIT_FAILURE;
 	eloop_free(ctx.ps_eloop);
 #endif