From: Roy Marples <roy@marples.name>
Date: Sat, 9 May 2015 10:11:51 +0000 (+0000)
Subject: Fix prior
X-Git-Tag: v6.9.0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=629225460b229a86e467b0c667cc5f631b77dbab;p=thirdparty%2Fdhcpcd.git

Fix prior
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 7228e9d3..d4546cc0 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1131,7 +1131,6 @@ handle_signal2(void *arg, int sig)
 	struct interface *ifp;
 	int do_release, exit_code;
 
-	ctx = dhcpcd_ctx;
 	do_release = 0;
 	exit_code = EXIT_FAILURE;
 	switch (sig) {
@@ -1389,7 +1388,9 @@ main(int argc, char **argv)
 
 	memset(&ctx, 0, sizeof(ctx));
 #ifdef USE_SIGNALS
+#ifndef HAVE_KQUEUE
 	dhcpcd_ctx = &ctx;
+#endif
 	sig = 0;
 	siga = NULL;
 #endif
diff --git a/eloop.c b/eloop.c
index 56ddeccb..cc8f62d9 100644
--- a/eloop.c
+++ b/eloop.c
@@ -421,7 +421,7 @@ eloop_requeue(struct eloop_ctx *ctx)
 	if ((ke = malloc(sizeof(*ke) * i)) == NULL)
 		return -1;
 
-	for (i = 0; ctx->signal[i] != 0; i++)
+	for (i = 0; ctx->signals[i] != 0; i++)
 		EV_SET(&ke[i], (uintptr_t)ctx->signals[i],
 		    EVFILT_SIGNAL, EV_ADD, 0, 0, UPTR(NULL));