From d7b87cdce289030a9d274e51404ad1a0580b36bd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 24 Jul 2008 14:46:43 +0200 Subject: Make use of TALLOC_FREE when freeing the per-winbindrequest memory context (This used to be commit 9e49d390f79c6afc8b0efd9664e60602aebaa4f2) --- source3/winbindd/winbindd.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'source3/winbindd/winbindd.c') diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 55ab58f7eb..cb16c765a1 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -546,10 +546,7 @@ static void response_extra_sent(void *private_data, bool success) struct winbindd_cli_state *state = talloc_get_type_abort(private_data, struct winbindd_cli_state); - if (state->mem_ctx != NULL) { - talloc_destroy(state->mem_ctx); - state->mem_ctx = NULL; - } + TALLOC_FREE(state->mem_ctx); if (!success) { state->finished = True; @@ -574,10 +571,7 @@ static void response_main_sent(void *private_data, bool success) } if (state->response.length == sizeof(state->response)) { - if (state->mem_ctx != NULL) { - talloc_destroy(state->mem_ctx); - state->mem_ctx = NULL; - } + TALLOC_FREE(state->mem_ctx); setup_async_read(&state->fd_event, &state->request, sizeof(uint32), request_len_recv, state); @@ -767,10 +761,7 @@ static void remove_client(struct winbindd_cli_state *state) SAFE_FREE(state->response.extra_data.data); - if (state->mem_ctx != NULL) { - talloc_destroy(state->mem_ctx); - state->mem_ctx = NULL; - } + TALLOC_FREE(state->mem_ctx); remove_fd_event(&state->fd_event); -- cgit