diff --git a/bin/delv/delv.c b/bin/delv/delv.c index d33facdec5..d045bfaa8c 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -2139,7 +2139,7 @@ run_server(void *arg) { RUNTIME_CHECK(inet_pton(AF_INET, "127.0.0.1", &in)); isc_sockaddr_fromin(&addr, &in, 0); - CHECK(ns_server_create(mctx, matchview, &sctx)); + ns_server_create(mctx, matchview, &sctx); CHECK(dns_dispatchmgr_create(mctx, netmgr, &dispatchmgr)); isc_sockaddr_any(&any); diff --git a/bin/named/server.c b/bin/named/server.c index ca4a5b3260..cbcba3d28d 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -10136,8 +10136,7 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) { atomic_init(&server->reload_status, NAMED_RELOAD_IN_PROGRESS); - CHECKFATAL(ns_server_create(mctx, get_matching_view, &server->sctx), - "creating server context"); + ns_server_create(mctx, get_matching_view, &server->sctx); #if defined(HAVE_GEOIP2) /* diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h index 8dc8b1cf3e..84003bf57f 100644 --- a/lib/ns/include/ns/server.h +++ b/lib/ns/include/ns/server.h @@ -133,7 +133,7 @@ struct ns_altsecret { unsigned char secret[32]; }; -isc_result_t +void ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview, ns_server_t **sctxp); /*%< diff --git a/lib/ns/server.c b/lib/ns/server.c index 8ef6254468..bd17a9baaa 100644 --- a/lib/ns/server.c +++ b/lib/ns/server.c @@ -35,7 +35,7 @@ RUNTIME_CHECK(result == ISC_R_SUCCESS); \ } while (0) -isc_result_t +void ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview, ns_server_t **sctxp) { ns_server_t *sctx; @@ -100,8 +100,6 @@ ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview, sctx->magic = SCTX_MAGIC; *sctxp = sctx; - - return (ISC_R_SUCCESS); } void