diff options
author | Gerald Carter <jerry@samba.org> | 2007-06-26 01:14:37 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2007-06-26 01:14:37 +0000 |
commit | f853ab4f5071c448d0b54f40cdb0584d305805a3 (patch) | |
tree | 7d3b01c0cdd6c6b45100225074b6166a6ef532e3 /source/nsswitch/winbindd_cm.c | |
parent | 74656050cd63ba6e78b50e8634041b60858a1bbb (diff) | |
download | samba-f853ab4f5071c448d0b54f40cdb0584d305805a3.tar.gz samba-f853ab4f5071c448d0b54f40cdb0584d305805a3.tar.xz samba-f853ab4f5071c448d0b54f40cdb0584d305805a3.zip |
r23602: grab final changes for 3.0.25b due out tomorrow
Diffstat (limited to 'source/nsswitch/winbindd_cm.c')
-rw-r--r-- | source/nsswitch/winbindd_cm.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/nsswitch/winbindd_cm.c b/source/nsswitch/winbindd_cm.c index 92119022290..f96478fe516 100644 --- a/source/nsswitch/winbindd_cm.c +++ b/source/nsswitch/winbindd_cm.c @@ -249,9 +249,7 @@ static void check_domain_online_handler(struct event_context *ctx, DEBUG(10,("check_domain_online_handler: called for domain %s\n", domain->name )); - if (domain->check_online_event) { - TALLOC_FREE(domain->check_online_event); - } + TALLOC_FREE(domain->check_online_event); /* Are we still in "startup" mode ? */ @@ -303,9 +301,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", @@ -400,9 +396,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. */ message_deregister(MSG_WINBIND_TRY_TO_GO_ONLINE); |