From f4eb916e856395bf1055c5b3f0583f816cd5c2b5 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 21 Jun 2007 14:04:55 +0000 Subject: r23565: Avoid double NULL pointer checks. Guenther (This used to be commit 5456ea59ba12593b0aac9745b41cdd0f5ec0a559) --- source3/nsswitch/winbindd_dual.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'source3/nsswitch/winbindd_dual.c') diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c index cc15398d42..312e1b5ad4 100644 --- a/source3/nsswitch/winbindd_dual.c +++ b/source3/nsswitch/winbindd_dual.c @@ -248,9 +248,7 @@ static void async_reply_recv(void *private_data, BOOL success) talloc_get_type_abort(private_data, struct winbindd_async_request); struct winbindd_child *child = state->child; - if (state->reply_timeout_event) { - TALLOC_FREE(state->reply_timeout_event); - } + TALLOC_FREE(state->reply_timeout_event); state->response->length = sizeof(struct winbindd_response); @@ -736,9 +734,7 @@ static void account_lockout_policy_handler(struct event_context *ctx, DEBUG(10,("account_lockout_policy_handler called\n")); - if (child->lockout_policy_event) { - TALLOC_FREE(child->lockout_policy_event); - } + TALLOC_FREE(child->lockout_policy_event); if ( !winbindd_can_contact_domain( child->domain ) ) { DEBUG(10,("account_lockout_policy_handler: Removing myself since I " @@ -1016,9 +1012,7 @@ static BOOL fork_domain_child(struct winbindd_child *child) for (domain = domain_list(); domain; domain = domain->next) { if (domain != child->domain) { - if (domain->check_online_event) { - TALLOC_FREE(domain->check_online_event); - } + TALLOC_FREE(domain->check_online_event); } } -- cgit