diff options
| -rw-r--r-- | source3/nsswitch/winbindd.c | 8 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd.h | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index 565764fa4b..56e0f16bcb 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -120,9 +120,8 @@ static void winbindd_status(void) if (DEBUGLEVEL >= 2 && winbindd_num_clients()) { DEBUG(2, ("\tclient list:\n")); for(tmp = winbindd_client_list(); tmp; tmp = tmp->next) { - DEBUG(2, ("\t\tpid %lu, sock %d, rbl %d, wbl %d\n", - (unsigned long)tmp->pid, tmp->sock, tmp->read_buf_len, - tmp->write_buf_len)); + DEBUG(2, ("\t\tpid %lu, sock %d\n", + (unsigned long)tmp->pid, tmp->sock)); } } } @@ -707,8 +706,7 @@ static BOOL remove_idle_client(void) int nidle = 0; for (state = winbindd_client_list(); state; state = state->next) { - if (state->read_buf_len == 0 && state->write_buf_len == 0 && - state->response.result != WINBINDD_PENDING && + if (state->response.result != WINBINDD_PENDING && !state->getpwent_state && !state->getgrent_state) { nidle++; if (!last_access || state->last_access < last_access) { diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h index 0db109dacd..3adf7717d6 100644 --- a/source3/nsswitch/winbindd.h +++ b/source3/nsswitch/winbindd.h @@ -60,7 +60,6 @@ struct winbindd_cli_state { int sock; /* Open socket from client */ struct fd_event fd_event; pid_t pid; /* pid of client */ - int read_buf_len, write_buf_len; /* Indexes in request/response */ BOOL finished; /* Can delete from list */ BOOL write_extra_data; /* Write extra_data field */ time_t last_access; /* Time of last access (read or write) */ |