summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-10-04 16:18:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:07 -0500
commit9989649fb47cba43b50465b77f62418b278bd127 (patch)
tree4ed1389bd502fd3907d90e01ecbcbe76c17bd4a4 /source3/nsswitch
parent58b8f72af68eaba567a273904dcc07c01dc3b00d (diff)
downloadsamba-9989649fb47cba43b50465b77f62418b278bd127.tar.gz
samba-9989649fb47cba43b50465b77f62418b278bd127.tar.bz2
samba-9989649fb47cba43b50465b77f62418b278bd127.zip
r19065: No functional change, just a trivial simplification
(This used to be commit 45628f71cfc770b1ba67abf38aac53ac40773cd0)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbindd.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 8d5a7042c6..6e61df99f1 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -634,37 +634,37 @@ static void remove_client(struct winbindd_cli_state *state)
{
/* It's a dead client - hold a funeral */
- if (state != NULL) {
+ if (state == NULL) {
+ return;
+ }
- /* Close socket */
+ /* Close socket */
- close(state->sock);
+ close(state->sock);
- /* Free any getent state */
+ /* Free any getent state */
- free_getent_state(state->getpwent_state);
- free_getent_state(state->getgrent_state);
+ free_getent_state(state->getpwent_state);
+ free_getent_state(state->getgrent_state);
- /* We may have some extra data that was not freed if the
- client was killed unexpectedly */
+ /* We may have some extra data that was not freed if the client was
+ killed unexpectedly */
- SAFE_FREE(state->response.extra_data.data);
+ SAFE_FREE(state->response.extra_data.data);
- if (state->mem_ctx != NULL) {
- talloc_destroy(state->mem_ctx);
- state->mem_ctx = NULL;
- }
+ if (state->mem_ctx != NULL) {
+ talloc_destroy(state->mem_ctx);
+ state->mem_ctx = NULL;
+ }
- remove_fd_event(&state->fd_event);
+ remove_fd_event(&state->fd_event);
- /* Remove from list and free */
+ /* Remove from list and free */
- winbindd_remove_client(state);
- TALLOC_FREE(state);
- }
+ winbindd_remove_client(state);
+ TALLOC_FREE(state);
}
-
/* Shutdown client connection which has been idle for the longest time */
static BOOL remove_idle_client(void)