45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
diff --git a/omapip/isclib.c b/omapip/isclib.c
|
|
index 9ec1a0f..42d82ff 100644
|
|
--- a/omapip/isclib.c
|
|
+++ b/omapip/isclib.c
|
|
@@ -185,16 +185,6 @@ dhcp_context_create(int flags,
|
|
if (result != ISC_R_SUCCESS)
|
|
goto cleanup;
|
|
|
|
- result = isc_app_ctxstart(dhcp_gbl_ctx.actx);
|
|
- if (result != ISC_R_SUCCESS)
|
|
- return (result);
|
|
- dhcp_gbl_ctx.actx_started = ISC_TRUE;
|
|
-
|
|
- /* Not all OSs support suppressing SIGPIPE through socket
|
|
- * options, so set the sigal action to be ignore. This allows
|
|
- * broken connections to fail gracefully with EPIPE on writes */
|
|
- handle_signal(SIGPIPE, SIG_IGN);
|
|
-
|
|
result = isc_taskmgr_createinctx(dhcp_gbl_ctx.mctx,
|
|
dhcp_gbl_ctx.actx,
|
|
1, 0,
|
|
@@ -217,6 +207,21 @@ dhcp_context_create(int flags,
|
|
result = isc_task_create(dhcp_gbl_ctx.taskmgr, 0, &dhcp_gbl_ctx.task);
|
|
if (result != ISC_R_SUCCESS)
|
|
goto cleanup;
|
|
+
|
|
+ result = isc_app_ctxstart(dhcp_gbl_ctx.actx);
|
|
+ if (result != ISC_R_SUCCESS)
|
|
+ return (result);
|
|
+ dhcp_gbl_ctx.actx_started = ISC_TRUE;
|
|
+
|
|
+ /* Not all OSs support suppressing SIGPIPE through socket
|
|
+ * options, so set the sigal action to be ignore. This allows
|
|
+ * broken connections to fail gracefully with EPIPE on writes */
|
|
+ handle_signal(SIGPIPE, SIG_IGN);
|
|
+
|
|
+ /* Reset handlers installed by isc_app_ctxstart()
|
|
+ * to default for control-c and kill */
|
|
+ handle_signal(SIGINT, SIG_DFL);
|
|
+ handle_signal(SIGTERM, SIG_DFL);
|
|
}
|
|
|
|
#if defined (NSUPDATE)
|
|
|