diff options
Diffstat (limited to 'bin/named/client.c')
| -rw-r--r-- | bin/named/client.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/bin/named/client.c b/bin/named/client.c index e8654cb0..933abc76 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -1395,9 +1395,9 @@ client_request(isc_task_t *task, isc_event_t *event) { INSIST(client->recursionquota == NULL); - INSIST(client->state == TCP_CLIENT(client) ? + INSIST(client->state == (TCP_CLIENT(client) ? NS_CLIENTSTATE_READING : - NS_CLIENTSTATE_READY); + NS_CLIENTSTATE_READY)); ns_client_requests++; @@ -2416,6 +2416,9 @@ ns_client_replace(ns_client_t *client) { CTRACE("replace"); + REQUIRE(client != NULL); + REQUIRE(client->manager != NULL); + result = get_client(client->manager, client->interface, client->dispatch, TCP_CLIENT(client)); if (result != ISC_R_SUCCESS) @@ -2507,10 +2510,10 @@ ns_clientmgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, return (ISC_R_SUCCESS); cleanup_listlock: - isc_mutex_destroy(&manager->listlock); + (void) isc_mutex_destroy(&manager->listlock); cleanup_lock: - isc_mutex_destroy(&manager->lock); + (void) isc_mutex_destroy(&manager->lock); cleanup_manager: isc_mem_put(manager->mctx, manager, sizeof(*manager)); @@ -2568,7 +2571,9 @@ get_client(ns_clientmgr_t *manager, ns_interface_t *ifp, ns_client_t *client; MTRACE("get client"); - if (manager != NULL && manager->exiting) + REQUIRE(manager != NULL); + + if (manager->exiting) return (ISC_R_SHUTTINGDOWN); /* |