diff options
| author | Steve French <stevef@smf-t60p.smfdom> | 2008-07-24 09:35:20 -0500 |
|---|---|---|
| committer | Steve French <stevef@smf-t60p.smfdom> | 2008-07-24 09:35:20 -0500 |
| commit | 890361db59ec293860fe2af7aaf7bdac0b7c03cb (patch) | |
| tree | 58c11abc756ef22df05cac63022362f2837988e0 /source3/winbindd/winbindd.c | |
| parent | 0732750497dabb441e4657093c329f829d91d58c (diff) | |
| parent | 8ea3ce5342f7ddcc0e36ff0b17d75ed74bdb6ce4 (diff) | |
| download | samba-890361db59ec293860fe2af7aaf7bdac0b7c03cb.tar.gz samba-890361db59ec293860fe2af7aaf7bdac0b7c03cb.tar.bz2 samba-890361db59ec293860fe2af7aaf7bdac0b7c03cb.zip | |
Merge branch 'v3-3-test' of git+ssh://sfrench@git.samba.org/data/git/samba into v33
(This used to be commit 22afe367fef35d4262d960973933023a0a5ce77d)
Diffstat (limited to 'source3/winbindd/winbindd.c')
| -rw-r--r-- | source3/winbindd/winbindd.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 55ab58f7eb..13c510d4f9 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -537,7 +537,6 @@ static void request_len_recv(void *private_data, bool success); static void request_recv(void *private_data, bool success); static void request_main_recv(void *private_data, bool success); static void request_finished(struct winbindd_cli_state *state); -void request_finished_cont(void *private_data, bool success); static void response_main_sent(void *private_data, bool success); static void response_extra_sent(void *private_data, bool success); @@ -546,10 +545,7 @@ static void response_extra_sent(void *private_data, bool success) struct winbindd_cli_state *state = talloc_get_type_abort(private_data, struct winbindd_cli_state); - if (state->mem_ctx != NULL) { - talloc_destroy(state->mem_ctx); - state->mem_ctx = NULL; - } + TALLOC_FREE(state->mem_ctx); if (!success) { state->finished = True; @@ -574,10 +570,7 @@ static void response_main_sent(void *private_data, bool success) } if (state->response.length == sizeof(state->response)) { - if (state->mem_ctx != NULL) { - talloc_destroy(state->mem_ctx); - state->mem_ctx = NULL; - } + TALLOC_FREE(state->mem_ctx); setup_async_read(&state->fd_event, &state->request, sizeof(uint32), request_len_recv, state); @@ -609,17 +602,6 @@ void request_ok(struct winbindd_cli_state *state) request_finished(state); } -void request_finished_cont(void *private_data, bool success) -{ - struct winbindd_cli_state *state = - talloc_get_type_abort(private_data, struct winbindd_cli_state); - - if (success) - request_ok(state); - else - request_error(state); -} - static void request_len_recv(void *private_data, bool success) { struct winbindd_cli_state *state = @@ -767,10 +749,7 @@ static void remove_client(struct winbindd_cli_state *state) SAFE_FREE(state->response.extra_data.data); - if (state->mem_ctx != NULL) { - talloc_destroy(state->mem_ctx); - state->mem_ctx = NULL; - } + TALLOC_FREE(state->mem_ctx); remove_fd_event(&state->fd_event); |