summaryrefslogtreecommitdiff
path: root/sbin/dhclient/dispatch.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2013-02-17 17:36:32 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2013-02-17 17:36:32 +0000
commit548214598c765bcb20ea07675bb5d05788e57874 (patch)
treec9fda9f57827c0aaca60c34b548c6523d2b8b36e /sbin/dhclient/dispatch.c
parentf7e7109b180491daa989293551a22ffadaab6191 (diff)
Using the value SIGQUIT to cause the dispatch loops to exit produced
universal revulsion and no little confusion. #define our own value, currently INT_MAX, which should not overlap any likely signal value.
Diffstat (limited to 'sbin/dhclient/dispatch.c')
-rw-r--r--sbin/dhclient/dispatch.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 65664feab5c..c62f9a4a3a9 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dispatch.c,v 1.73 2013/02/17 17:04:41 krw Exp $ */
+/* $OpenBSD: dispatch.c,v 1.74 2013/02/17 17:36:31 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -119,7 +119,7 @@ dispatch(void)
another:
if (!ifi) {
warning("No interfaces available");
- quit = SIGQUIT;
+ quit = INTERNALSIG;
continue;
}
@@ -127,7 +127,7 @@ another:
warning("Interface %s:"
" rdomain changed out from under us",
ifi->name);
- quit = SIGQUIT;
+ quit = INTERNALSIG;
continue;
}
@@ -155,7 +155,7 @@ another:
/* Set up the descriptors to be polled. */
if (!ifi || ifi->rfdesc == -1) {
warning("No live interface to poll on");
- quit = SIGQUIT;
+ quit = INTERNALSIG;
continue;
}
@@ -176,7 +176,7 @@ another:
continue;
} else {
warning("poll: %s", strerror(errno));
- quit = SIGQUIT;
+ quit = INTERNALSIG;
continue;
}
}
@@ -192,13 +192,13 @@ another:
if (fds[2].revents & POLLOUT) {
if (msgbuf_write(&unpriv_ibuf->w) == -1) {
warning("pipe write error to [priv]");
- quit = SIGQUIT;
+ quit = INTERNALSIG;
continue;
}
}
if ((fds[2].revents & (POLLIN | POLLHUP))) {
/* Pipe to [priv] closed. Assume it emitted error. */
- quit = SIGQUIT;
+ quit = INTERNALSIG;
continue;
}
}