diff options
| author | Günther Deschner <gd@samba.org> | 2007-06-21 14:04:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:30 -0500 |
| commit | f4eb916e856395bf1055c5b3f0583f816cd5c2b5 (patch) | |
| tree | d642ffbec4f5cd3474a3f83a5bb891699ca35e54 | |
| parent | fd881f40670792452247de5f6711b5a943612f03 (diff) | |
| download | samba-f4eb916e856395bf1055c5b3f0583f816cd5c2b5.tar.gz samba-f4eb916e856395bf1055c5b3f0583f816cd5c2b5.tar.bz2 samba-f4eb916e856395bf1055c5b3f0583f816cd5c2b5.zip | |
r23565: Avoid double NULL pointer checks.
Guenther
(This used to be commit 5456ea59ba12593b0aac9745b41cdd0f5ec0a559)
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 12 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_dual.c | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index c5e014192e..0571cdad60 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -258,9 +258,7 @@ static void check_domain_online_handler(struct event_context *ctx, "%s (online = %s)\n", domain->name, domain->online ? "True" : "False" )); - if (domain->check_online_event) { - TALLOC_FREE(domain->check_online_event); - } + TALLOC_FREE(domain->check_online_event); /* Are we still in "startup" mode ? */ @@ -312,9 +310,7 @@ void set_domain_offline(struct winbindd_domain *domain) DEBUG(10,("set_domain_offline: called for domain %s\n", domain->name )); - if (domain->check_online_event) { - TALLOC_FREE(domain->check_online_event); - } + TALLOC_FREE(domain->check_online_event); if (domain->internal) { DEBUG(3,("set_domain_offline: domain %s is internal - logic error.\n", @@ -426,9 +422,7 @@ static void set_domain_online(struct winbindd_domain *domain) /* Ensure we have no online timeout checks. */ domain->check_online_timeout = 0; - if (domain->check_online_event) { - TALLOC_FREE(domain->check_online_event); - } + TALLOC_FREE(domain->check_online_event); /* Ensure we ignore any pending child messages. */ messaging_deregister(winbind_messaging_context(), 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); } } |