sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r23565: Avoid double NULL pointer checks.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2007-06-21 14:04:55 +00:00 committed by Gerald (Jerry) Carter
parent 2592e68a43
commit 5456ea59ba
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/nsswitch/winbindd_cm.c
View File

@ -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(),

12
source/nsswitch/winbindd_dual.c
View File

@ -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);
}
}