Commit 650ae59e authored by Thomas Markwalder's avatar Thomas Markwalder

[#16,!9] Addressed more review comments

parent 5df5813d
...@@ -82,7 +82,7 @@ dhcp_dns_client_setservers(void) ...@@ -82,7 +82,7 @@ dhcp_dns_client_setservers(void)
} }
return (result); return (result);
} }
#endif #endif /* defined NSUPDATE */
void void
isclib_cleanup(void) isclib_cleanup(void)
...@@ -90,7 +90,7 @@ isclib_cleanup(void) ...@@ -90,7 +90,7 @@ isclib_cleanup(void)
#if defined (NSUPDATE) #if defined (NSUPDATE)
if (dhcp_gbl_ctx.dnsclient != NULL) if (dhcp_gbl_ctx.dnsclient != NULL)
dns_client_destroy((dns_client_t **)&dhcp_gbl_ctx.dnsclient); dns_client_destroy((dns_client_t **)&dhcp_gbl_ctx.dnsclient);
#endif #endif /* defined NSUPDATE */
if (dhcp_gbl_ctx.task != NULL) { if (dhcp_gbl_ctx.task != NULL) {
isc_task_shutdown(dhcp_gbl_ctx.task); isc_task_shutdown(dhcp_gbl_ctx.task);
...@@ -171,14 +171,14 @@ dhcp_context_create(int flags, ...@@ -171,14 +171,14 @@ dhcp_context_create(int flags,
result = dns_lib_init(); result = dns_lib_init();
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
#else #else /* defined NSUPDATE */
/* The dst library is inited as part of dns_lib_init, we don't /* The dst library is inited as part of dns_lib_init, we don't
* need it if NSUPDATE is enabled */ * need it if NSUPDATE is enabled */
result = dst_lib_init(dhcp_gbl_ctx.mctx, NULL, 0); result = dst_lib_init(dhcp_gbl_ctx.mctx, NULL, 0);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
#endif #endif /* defined NSUPDATE */
result = isc_appctx_create(dhcp_gbl_ctx.mctx, result = isc_appctx_create(dhcp_gbl_ctx.mctx,
&dhcp_gbl_ctx.actx); &dhcp_gbl_ctx.actx);
...@@ -246,7 +246,7 @@ dhcp_context_create(int flags, ...@@ -246,7 +246,7 @@ dhcp_context_create(int flags,
result = dns_client_init(); result = dns_client_init();
} }
} }
#endif #endif /* defined NSUPDATE */
return(ISC_R_SUCCESS); return(ISC_R_SUCCESS);
...@@ -388,4 +388,4 @@ isc_result_t dns_client_init() { ...@@ -388,4 +388,4 @@ isc_result_t dns_client_init() {
return ISC_R_SUCCESS; return ISC_R_SUCCESS;
} }
#endif // defined (NSUPDATE) #endif /* defined (NSUPDATE) */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment